{"id":2221406,"url":"http://patchwork.ozlabs.org/api/1.0/patches/2221406/?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-10-marcin.szycik@linux.intel.com>","date":"2026-04-09T12:00:02","name":"[iwl-next,v2,09/10] ice: re-introduce ice_dealloc_flow_entry() helper","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"88357e8e0b39e7579463a40042571f08dbb24b64","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-10-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/2221406/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=ashDbMNU;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=osuosl.org\n (client-ip=2605:bc80:3010::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 [IPv6:2605:bc80:3010::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 4fs0R92Yjpz1yCv\n\tfor ; Thu, 09 Apr 2026 23:00:37 +1000 (AEST)","from localhost (localhost [127.0.0.1])\n\tby smtp3.osuosl.org (Postfix) with ESMTP id 7F35E60B38;\n\tThu, 9 Apr 2026 13:00:34 +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 ENd9HxcDdb2F; Thu, 9 Apr 2026 13:00:33 +0000 (UTC)","from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142])\n\tby smtp3.osuosl.org (Postfix) with ESMTP id 5484961013;\n\tThu, 9 Apr 2026 13:00:33 +0000 (UTC)","from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n by lists1.osuosl.org (Postfix) with ESMTP id 1F8A61F6\n for ; Thu, 9 Apr 2026 13:00:30 +0000 (UTC)","from localhost (localhost [127.0.0.1])\n by smtp2.osuosl.org (Postfix) with ESMTP id F116D400F6\n for ; Thu, 9 Apr 2026 13:00:29 +0000 (UTC)","from smtp2.osuosl.org ([127.0.0.1])\n by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP\n id lbtHUCVIOYEX for ;\n Thu, 9 Apr 2026 13:00:28 +0000 (UTC)","from mgamail.intel.com (mgamail.intel.com [192.198.163.19])\n by smtp2.osuosl.org (Postfix) with ESMTPS id 2592840340\n for ; Thu, 9 Apr 2026 13:00:28 +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:21 -0700","from irvmail002.ir.intel.com ([10.43.11.120])\n by orviesa002.jf.intel.com with ESMTP; 09 Apr 2026 06:00:19 -0700","from gond.igk.intel.com (gond.igk.intel.com [10.123.220.52])\n by irvmail002.ir.intel.com (Postfix) with ESMTP id 1C6B92FC58;\n Thu, 9 Apr 2026 14:00:18 +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 5484961013","OpenDKIM Filter v2.11.0 smtp2.osuosl.org 2592840340"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org;\n\ts=default; t=1775739633;\n\tbh=0eMNwm7bu6O50BJcpukG7TAWSppmOBm5fjMjJvjTytk=;\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=ashDbMNUIOe8LMTla96KssgVJmsYhZfeX8U9lnstph0FOQkZyt4smvNUBql8Y82HQ\n\t 4m4/noicCrkuGtTIkZKqev5XtmNqermo6GisISceb/ksQaAzima8VqcN8YNLOIFPzK\n\t EbS/GvAc3tjoVaO5pmw+sKkd5s4MSHnx+OBWjQmE56kAe+h9Ib6CDpnUVVtLRDcgDY\n\t SkXcbJx3DWuUAygh8cWuG26SAdbVB12cVoc3aHGho18yz3o/VVOvjQP7hnmDv8Ok+/\n\t eDp/tkdzquk/N7g3CaAvZdiUgiAnGngiB96Su2ZJNMIZdwHKKN9zTSs1suSMn263C1\n\t JQzPRxhGnAJmA==","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 smtp2.osuosl.org 2592840340","X-CSE-ConnectionGUID":["o/yxpxOuRlmPKXuadhm/jQ==","dMn2HIOoRGGLC69kyQk0pQ=="],"X-CSE-MsgGUID":["OO1sEzirQqyo3OsHU4C9Jw==","7BHlYphpTbqhInD1DSh7oA=="],"X-IronPort-AV":["E=McAfee;i=\"6800,10657,11753\"; a=\"75777536\"","E=Sophos;i=\"6.23,169,1770624000\"; d=\"scan'208\";a=\"75777536\"","E=Sophos;i=\"6.23,169,1770624000\"; d=\"scan'208\";a=\"259208137\""],"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 14:00:02 +0200","Message-ID":"<20260409120003.2719-10-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=1775739628; x=1807275628;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=fw3VWQaw3jKVivPmKcKZkhU6kwzRwU/BAJwJqJQoaQw=;\n b=UX5MjVvLeMaTmtSBrGeiQl5r4vYYu0TywnRpjiQ2M6QUsVmWQ5gMKRkf\n MqSJZHfaHfJ/hllmcKi4O8FDkTsDELfvOxedstedAh+q0pbs7/SqtpKE+\n JnJKMZDX2c7+qf1FDvfGaoJcAF1QDZag/ZTqcceXs/zvFn2b97aQxjEiY\n SNNcwKJrVcNCtw75TSnoneFy/B5iiUqmsgKDuIruyGCsqB2/E5GF35jGl\n S3dRk2MGTNN9IpjM7itqsWZy54K9sxHyv5EHtTLSGNYwIHcohcFKjM1Hd\n I9t18Ok6qr54JP/9VXuztrcifxOSt+UHE1hiWToQWlxT/UB44a38dSUVZ\n Q==;","X-Mailman-Original-Authentication-Results":["smtp2.osuosl.org;\n dmarc=none (p=none dis=none)\n header.from=linux.intel.com","smtp2.osuosl.org;\n dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com\n header.a=rsa-sha256 header.s=Intel header.b=UX5MjVvL"],"Subject":"[Intel-wired-lan] [PATCH iwl-next v2 09/10] ice: re-introduce\n ice_dealloc_flow_entry() helper","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":"It was removed in commit ad667d626825 (\"ice: remove null checks before\ndevm_kfree() calls\"). Now it's useful again.\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.c | 33 ++++++++++++++---------\n 1 file changed, 20 insertions(+), 13 deletions(-)","diff":"diff --git a/drivers/net/ethernet/intel/ice/ice_flow.c b/drivers/net/ethernet/intel/ice/ice_flow.c\nindex 144d8326d4f9..20ee85b0bcf0 100644\n--- a/drivers/net/ethernet/intel/ice/ice_flow.c\n+++ b/drivers/net/ethernet/intel/ice/ice_flow.c\n@@ -1589,6 +1589,23 @@ ice_flow_find_prof_id(struct ice_hw *hw, enum ice_block blk, u64 prof_id)\n \treturn NULL;\n }\n \n+/**\n+ * ice_dealloc_flow_entry - Deallocate flow entry memory\n+ * @hw: pointer to the HW struct\n+ * @entry: flow entry to be removed\n+ */\n+static void\n+ice_dealloc_flow_entry(struct ice_hw *hw, struct ice_flow_entry *entry)\n+{\n+\tif (!entry)\n+\t\treturn;\n+\n+\tkfree(entry->entry);\n+\tkfree(entry->range_buf);\n+\tkfree(entry->acts);\n+\tdevm_kfree(ice_hw_to_dev(hw), entry);\n+}\n+\n /**\n * ice_flow_get_hw_prof - return the HW profile for a specific profile ID handle\n * @hw: pointer to the HW struct\n@@ -1760,11 +1777,7 @@ static int ice_flow_rem_entry_sync(struct ice_hw *hw, enum ice_block blk,\n \t}\n \n \tlist_del(&entry->l_entry);\n-\n-\tkfree(entry->entry);\n-\tkfree(entry->range_buf);\n-\tkfree(entry->acts);\n-\tdevm_kfree(ice_hw_to_dev(hw), entry);\n+\tice_dealloc_flow_entry(hw, entry);\n \n \treturn 0;\n }\n@@ -2899,10 +2912,7 @@ static int ice_flow_acl_add_scen_entry_sync(struct ice_hw *hw,\n \t\t/* As we don't add the new entry to our SW DB, deallocate its\n \t\t * memories, and return the exist entry to the caller\n \t\t */\n-\t\tkfree(e->entry);\n-\t\tkfree(e->range_buf);\n-\t\tkfree(e->acts);\n-\t\tdevm_kfree(ice_hw_to_dev(hw), e);\n+\t\tice_dealloc_flow_entry(hw, e);\n \t\t*entry = exist;\n \t}\n out:\n@@ -3021,10 +3031,7 @@ int ice_flow_add_entry(struct ice_hw *hw, enum ice_block blk, u64 prof_id,\n \n out:\n \tif (status && e) {\n-\t\tkfree(e->entry);\n-\t\tkfree(e->range_buf);\n-\t\tkfree(e->acts);\n-\t\tdevm_kfree(ice_hw_to_dev(hw), e);\n+\t\tice_dealloc_flow_entry(hw, e);\n \t}\n \n \treturn status;\n","prefixes":["iwl-next","v2","09/10"]}