From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.20]) (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 DB9F43DA5AE for ; Thu, 21 May 2026 12:50:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.20 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779367827; cv=none; b=gSsblHRUNigZaM4M7DBpYhOakxvrewv/rZ2rRaV7/lLj+kfs2nHrgV9uM5tFJjtZaOB+msPkoNgsbMee2ape1b7g8j0PiT9fsQnN5joPjNMIni1PzLtgT81qppxT1o4vDaQXfieLvGrTj7D5xsTbDu0oM7i+o8Ralv70n7fcHkY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779367827; c=relaxed/simple; bh=XPjgjfXxDJbAO1pCwf5tCCchzCnZ52KDl1yvvyI+Y54=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DdbR6kx+2w14U5Gi4Wpf/0koOMkgvMB12Q9F1nteo1PECG/Sx2b/0WsXtL9/khvRnFtWicn2hCCCWuxk0CdtBt132rgNSSMusmFWigpQlAKGJhGl/9d7WZEKfvhgBDJbCAiA0JcM964NXI/e5dP4ar6f8FsTDLyEn2Qfn9WnCMk= 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=Lu3bPFoZ; arc=none smtp.client-ip=198.175.65.20 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="Lu3bPFoZ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1779367826; x=1810903826; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=XPjgjfXxDJbAO1pCwf5tCCchzCnZ52KDl1yvvyI+Y54=; b=Lu3bPFoZtMhkbNRerdaD4xP3hT/KpCpe84Qxn/Wc52Uae7dCHWjoHXy4 48RfUkoGzacW3cSxMgLBoxVNiaef0Q8jn2rPOoP9HuCmzklDUFbAleN5T i0qWzLz8Q4II8Gtd6p7f+Ri8Dkbu/a0S/M05+8Xf83+MOLZPpdHUlX1xJ OXiWrlHbYpnnNoPUaZgwg0RaB8GvFXb+6bR4kF+HTYtBWbUkv/b2hTTqv zI8rcnFNvtY5uIDlyA50M1I1K1qBObrEm5KClVlUwu/nEF07whcbUF7bj kMdaAKURyJYKqNmKFWymEtkHfMTqDmbQQ9HN1veB2nTUOUSWKM0Cx+apZ g==; X-CSE-ConnectionGUID: wJ+g37xaQoGjD8Fv90ifYA== X-CSE-MsgGUID: cKeAptMSTxi79E9DY0hViQ== X-IronPort-AV: E=McAfee;i="6800,10657,11792"; a="80013509" X-IronPort-AV: E=Sophos;i="6.23,246,1770624000"; d="scan'208";a="80013509" Received: from fmviesa003.fm.intel.com ([10.60.135.143]) by orvoesa112.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 May 2026 05:50:25 -0700 X-CSE-ConnectionGUID: d4cW2P5uRp6oPoICV8f7Hg== X-CSE-MsgGUID: nKYbTJ+9TqO/o6iP4CkkWA== X-ExtLoop1: 1 Received: from irvmail002.ir.intel.com ([10.43.11.120]) by fmviesa003.fm.intel.com with ESMTP; 21 May 2026 05:50:23 -0700 Received: from gond.igk.intel.com (gond.igk.intel.com [10.123.220.52]) by irvmail002.ir.intel.com (Postfix) with ESMTP id 1152328781; Thu, 21 May 2026 13:50:22 +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 Subject: [PATCH iwl-next v4 06/10] ice: use plain alloc/dealloc for ice_ntuple_fltr Date: Thu, 21 May 2026 13:49:56 +0200 Message-ID: <20260521115000.4637-7-marcin.szycik@linux.intel.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20260521115000.4637-1-marcin.szycik@linux.intel.com> References: <20260521115000.4637-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 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 b8014a0e7df4..44c3e4f50146 100644 --- a/drivers/net/ethernet/intel/ice/ice_ethtool_ntuple.c +++ b/drivers/net/ethernet/intel/ice/ice_ethtool_ntuple.c @@ -1750,7 +1750,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); } } @@ -1853,7 +1853,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; @@ -2204,7 +2204,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; @@ -2248,7 +2248,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