From mboxrd@z Thu Jan 1 00:00:00 1970 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 smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9F98BCD484A for ; Mon, 11 May 2026 14:07:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 642F9812FD; Mon, 11 May 2026 14:07:39 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id jvpvs__38lNw; Mon, 11 May 2026 14:07:38 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.142; helo=lists1.osuosl.org; envelope-from=intel-wired-lan-bounces@osuosl.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 95CD9812B9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org; s=default; t=1778508458; bh=u3s8SFo99oi8+JbbCgvtb5qeEvxlsMgT/LDLNj65x/I=; h=From:To:Cc:Date:In-Reply-To:References:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=OVCawQ5hx7IJiK4mPltsVGLFB2L8fNmWYAmjy8wAvxfRhjA85wxApRy+9gk7ayaUD BoGDLIAFbq3lRZ5l21B8wNTSvLAAhqgzG6KwGQP4c1Z0Iv5x6B3MXcIN4csF9COc5K BVpeADc/AEe3kX1PGgmgwNSDOphuvuIV73ld/42/A7WkNyf0S0yD54A/wv3hO93eXz yXEg+9qmMjdpEHtPJe2qVPgH6JnkiBhK8UjjEIpa2BaWlJMcvcx+NqzPNYiFXg4ASd 3Mr004N9UgFAJuned3BRBx/TLRLqwpRRq6K17bH/xUbxnUgCDE8IeEtSiLh229hVt8 L9j5V0wSJyzfA== Received: from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142]) by smtp1.osuosl.org (Postfix) with ESMTP id 95CD9812B9; Mon, 11 May 2026 14:07:38 +0000 (UTC) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists1.osuosl.org (Postfix) with ESMTP id 036FB272 for ; Mon, 11 May 2026 14:07:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 01771416C8 for ; Mon, 11 May 2026 14:07:37 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id AG5TLVLqkEqj for ; Mon, 11 May 2026 14:07:36 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=198.175.65.14; helo=mgamail.intel.com; envelope-from=marcin.szycik@linux.intel.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp4.osuosl.org 568F6416C0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 568F6416C0 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.14]) by smtp4.osuosl.org (Postfix) with ESMTPS id 568F6416C0 for ; Mon, 11 May 2026 14:07:36 +0000 (UTC) X-CSE-ConnectionGUID: 7LpddZ1IQ3iSmIfFYnt90Q== X-CSE-MsgGUID: z9ekHr6mSFma7ZAw5z8wrQ== X-IronPort-AV: E=McAfee;i="6800,10657,11783"; a="83265219" X-IronPort-AV: E=Sophos;i="6.23,229,1770624000"; d="scan'208";a="83265219" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by orvoesa106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 May 2026 07:07:35 -0700 X-CSE-ConnectionGUID: 0WCFnalJQPmf07MWRufLuA== X-CSE-MsgGUID: gD8yFaKaQ5m7LD48yE02Eg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,229,1770624000"; d="scan'208";a="237685824" Received: from irvmail002.ir.intel.com ([10.43.11.120]) by orviesa007.jf.intel.com with ESMTP; 11 May 2026 07:07:34 -0700 Received: from gond.igk.intel.com (gond.igk.intel.com [10.123.220.52]) by irvmail002.ir.intel.com (Postfix) with ESMTP id AEB562FC51; Mon, 11 May 2026 15:07:32 +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 Date: Mon, 11 May 2026 15:07:04 +0200 Message-ID: <20260511130710.38801-6-marcin.szycik@linux.intel.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20260511130710.38801-1-marcin.szycik@linux.intel.com> References: <20260511130710.38801-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; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1778508456; x=1810044456; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=icADDd2KOT855mztfX2cI/CHcPBzXRh4dlK5GAnzF6c=; b=TyID5a5xu5OQlIcLG80mkU7e/MZm45BR2UT3NaGlIdY0a04TL19Ub9Jd lKeRDKT0XMF5Ij3hY+aaZDJGF1FwFiwtMkZJz6HmFOESq/uoDDdjPfoy2 PpFL68mHzwuY/2iZtrzWDyhZa8M4xqf1Kv7CwQ+EQxCd4k5WlW8HThwnG WyAtrulBa8y7MLT3MVE4w4foTInwcB+enOs+uNeGonzsfuoIOdYzD11eA h77t3u/3NRbcepbI4Ucso3xZXDhK4hz9dcY2NCOBFktIJPrwR1NAnlH5T Xs+/5Mt5CvyJ+R7cVBsiKTsBAaByoOM0thZnjLZpqWZzzyFBH1TgX6nH2 g==; X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dmarc=none (p=none dis=none) header.from=linux.intel.com X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=TyID5a5x Subject: [Intel-wired-lan] [PATCH iwl-next v3 05/10] Revert "ice: remove 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-wired-lan-bounces@osuosl.org Sender: "Intel-wired-lan" 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 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