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 smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (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 47414CD37AC for ; Mon, 11 May 2026 14:07:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 59F6D416E2; Mon, 11 May 2026 14:07:41 +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 WwzNA9cTZHjU; Mon, 11 May 2026 14:07:40 +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 smtp4.osuosl.org 2B56A416D7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org; s=default; t=1778508460; bh=KN8Lzw2LVSJsBCHP543Oc/jDYeIBafmC4R/LDgFBiQQ=; h=From:To:Cc:Date:In-Reply-To:References:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=C1L99MBZ5kIT3y6hKnsO7HFy08Y/NBC4zeZlTHBew3VO8cNivDQbmvyy1D4StVucm iaMzBJ/zEQr7V1OKoLyyuzbBkVZHumxFm8EahawD1dxzavA6JL691UMrhT1lThqL4K 4sw+S/G5j1WLCvGVAPuhXXBLIvfs5ZFex9K+NcmhYHwfVl/oG7IPoBq40TJc7ZGDkn UVIyuXKhOJEQHz32C8H64Wgo/uQ0cW3q3hVxPGVqpoqB6kbK4LNFuq1WoJxFsgBp5L 2AklFxMNf3IZOY08zm/SICIaXK5S0H0fZfeM8Nz8H+wiFFayAEU/oJUfS4hFZJ3LdT tKu9eculv2RJA== Received: from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142]) by smtp4.osuosl.org (Postfix) with ESMTP id 2B56A416D7; Mon, 11 May 2026 14:07:40 +0000 (UTC) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) by lists1.osuosl.org (Postfix) with ESMTP id 1E088272 for ; Mon, 11 May 2026 14:07:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 49520416C0 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 ZczU4htpbIq6 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 9DAE0416C6 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 9DAE0416C6 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.14]) by smtp4.osuosl.org (Postfix) with ESMTPS id 9DAE0416C6 for ; Mon, 11 May 2026 14:07:36 +0000 (UTC) X-CSE-ConnectionGUID: lxBsICxWQXOakgepDj5ICg== X-CSE-MsgGUID: CrMHV8lbRO+BiHfJIPaFfA== X-IronPort-AV: E=McAfee;i="6800,10657,11783"; a="83265222" X-IronPort-AV: E=Sophos;i="6.23,229,1770624000"; d="scan'208";a="83265222" 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: Cimb0U5mQ3qV3LkRjUlvig== X-CSE-MsgGUID: 8z6iAGhvROG+X5tbKlISPg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,229,1770624000"; d="scan'208";a="237685827" 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 4A69D2FC4B; Mon, 11 May 2026 15:07:33 +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 Date: Mon, 11 May 2026 15:07:05 +0200 Message-ID: <20260511130710.38801-7-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=F7jFNdnh09WfVR6eOYaGwY+WEg+3eXvo/cT82vX4ZcU=; b=T3dc0Uk2qAGWerOPqW+70ZIHTjMMjQORGZ5n0THt+WQGiVAtC25VMuMl /iuPJDQbcdMVaH2hYdpnlhdWY0G6VlqAVjZ++AyktsUFwGVU269Z/j5Nz Ft21lfssI35nyp/q07zqa3h9ZMgV1QRSn5Rnmjul0UHcRgXAUHmEgiR6J 71fidBRrR3jLbcEqby8S9j9cphsAtzTLTivJglCurGbqmYFH2zhyvSs3/ oNoz36jODMFVSOjPBKyoFG6ux+uc2q5rE1H3dYapqgwSi3ziRFzDQ6Tsi cDGm16f72Ae7AHSN+ZzDAHAR3Fo43GE/AEDTbounudU7ioLNiXE8LilUn Q==; 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=T3dc0Uk2 Subject: [Intel-wired-lan] [PATCH iwl-next v3 06/10] ice: use plain alloc/dealloc for ice_ntuple_fltr 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" Change struct ice_ntuple_fltr allocation from devm_ to plain alloc, since its lifetime is not tied to the device. All such objects are being removed on device remove via ice_deinit_features() -> ice_deinit_fdir() -> ice_vsi_manage_fdir() -> ice_fdir_del_all_fltrs() Signed-off-by: Marcin Szycik Reviewed-by: Aleksandr Loktionov --- v2: * Add this patch --- drivers/net/ethernet/intel/ice/ice_ethtool_ntuple.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/intel/ice/ice_ethtool_ntuple.c b/drivers/net/ethernet/intel/ice/ice_ethtool_ntuple.c index e3ea5aed4dd5..f0e14bac2539 100644 --- a/drivers/net/ethernet/intel/ice/ice_ethtool_ntuple.c +++ b/drivers/net/ethernet/intel/ice/ice_ethtool_ntuple.c @@ -1722,7 +1722,7 @@ void ice_fdir_del_all_fltrs(struct ice_vsi *vsi) ice_fdir_write_all_fltr(pf, f_rule, false); ice_fdir_update_cntrs(hw, f_rule, false); list_del(&f_rule->fltr_node); - devm_kfree(ice_pf_to_dev(pf), f_rule); + kfree(f_rule); } } @@ -1829,7 +1829,7 @@ ice_ntuple_update_list_entry(struct ice_pf *pf, struct ice_ntuple_fltr *input, */ ice_fdir_do_rem_flow(pf, old_fltr->flow_type); list_del(&old_fltr->fltr_node); - devm_kfree(ice_hw_to_dev(hw), old_fltr); + kfree(old_fltr); } if (!input) return err; @@ -2180,7 +2180,7 @@ int ice_add_ntuple_ethtool(struct ice_vsi *vsi, struct ethtool_rxnfc *cmd) return -ENOSPC; } - input = devm_kzalloc(dev, sizeof(*input), GFP_KERNEL); + input = kzalloc_obj(*input); if (!input) return -ENOMEM; @@ -2224,7 +2224,7 @@ int ice_add_ntuple_ethtool(struct ice_vsi *vsi, struct ethtool_rxnfc *cmd) mutex_unlock(&hw->fdir_fltr_lock); free_input: if (ret) - devm_kfree(dev, input); + kfree(input); return ret; } -- 2.49.0