From nobody Fri Dec 19 20:39:18 2025 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.17]) (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 ED2081DDC2B; Fri, 16 May 2025 14:58:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.17 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747407520; cv=none; b=HmyIWEXPhu3J6U8OX8zrH+a+w6IX6kkwkxxCppgv5DZQH4eTghMjbPy5d0pwPiD9AUizwPjMzsvThkoJR+SjGiG6i/uXjEa5R4kR6xXm1yTPetL015ibMdRcnanyMWANH5NF5zm3J98kMXyQjCphM5V/D5p8sBIyS6t2M4SVL4s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747407520; c=relaxed/simple; bh=qG3Hic5PnvaSICPRwocLA9lq2ffZgqx30qUGVzOq5Y4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uPpapj+0kS0ulM2BF5+BWAkzJB9SIaTd0Wik0+oMIjo/BgCcgsKXlPtxj2pSzl1s1f2DfC6wM81hnLxQQeDsP1UkmTN5vc9R2+a9JVE9whFMO8CdArCsInaVonXDI+3jE0TytSkiq0ZNVe0DCPcDldmTVkSiszTwk0BtUlKlVM8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=mKQxaeYK; arc=none smtp.client-ip=192.198.163.17 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="mKQxaeYK" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1747407519; x=1778943519; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=qG3Hic5PnvaSICPRwocLA9lq2ffZgqx30qUGVzOq5Y4=; b=mKQxaeYKgLLELouUWXwWeEDh7mxkC36lK6otTlIscSyTkZgtY1k5lfaY 7b2IAPcgDUaALXpTJAGTbFbh9iniBUTavXV2i+Jiaxuj6iNsihOpTFZoF Gqrgc90Btl5x6ugzE1dAt3xI0kPTSCWNaDxbBLEtufFkHSrQBSwqIzZq9 Y65T4tkqadFBxJP3in3MSXLt6kGLPRJn2/CDSdOOHSZC+Kwoi6yiq6OPS MvX7RMqoPg6aXG+EZ5IVELPfs/gGsOiWKfe9pNffdHoJcMv7rM/Q2h17G iKSxq/xzTJ7QxDyYpFHunMaRF6cY6KCHj29XCu9wQFfyR420e3NeyBG+/ g==; X-CSE-ConnectionGUID: ueQFrCPPSxCIq5n3wPGwSg== X-CSE-MsgGUID: kXhh0je7QX6PJOaTnbku/g== X-IronPort-AV: E=McAfee;i="6700,10204,11435"; a="49308636" X-IronPort-AV: E=Sophos;i="6.15,294,1739865600"; d="scan'208";a="49308636" Received: from fmviesa003.fm.intel.com ([10.60.135.143]) by fmvoesa111.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 May 2025 07:58:38 -0700 X-CSE-ConnectionGUID: QZL2wTNkTCa/OxtXPDzZqw== X-CSE-MsgGUID: oBgbTaKkTtafkyvDxNIHSg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,294,1739865600"; d="scan'208";a="142717967" Received: from irvmail002.ir.intel.com ([10.43.11.120]) by fmviesa003.fm.intel.com with ESMTP; 16 May 2025 07:58:32 -0700 Received: from mglak.igk.intel.com (mglak.igk.intel.com [10.237.112.146]) by irvmail002.ir.intel.com (Postfix) with ESMTP id CCC1934326; Fri, 16 May 2025 15:58:29 +0100 (IST) From: Larysa Zaremba To: intel-wired-lan@lists.osuosl.org, Tony Nguyen Cc: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Jonathan Corbet , Przemek Kitszel , Jiri Pirko , Tatyana Nikolova , Andrew Lunn , Alexander Lobakin , Michael Ellerman , Maciej Fijalkowski , Lee Trager , Madhavan Srinivasan , Larysa Zaremba , Sridhar Samudrala , Jacob Keller , Michal Swiatkowski , Mateusz Polchlopek , Ahmed Zaki , netdev@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, "Karlsson, Magnus" , Emil Tantilov , Madhu Chittim , Josh Hay , Milena Olech , pavan.kumar.linga@intel.com, "Singhai, Anjali" Subject: [PATCH iwl-next v4 07/15] idpf: remove 'vport_params_reqd' field Date: Fri, 16 May 2025 16:58:04 +0200 Message-ID: <20250516145814.5422-8-larysa.zaremba@intel.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20250516145814.5422-1-larysa.zaremba@intel.com> References: <20250516145814.5422-1-larysa.zaremba@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Pavan Kumar Linga While sending a create vport message to the device control plane, a create vport virtchnl message is prepared with all the required info to initialize the vport. This info is stored in the adapter struct but never used thereafter. So, remove the said field. Signed-off-by: Pavan Kumar Linga Reviewed-by: Maciej Fijalkowski Signed-off-by: Larysa Zaremba Tested-by: Samuel Salin --- drivers/net/ethernet/intel/idpf/idpf.h | 2 -- drivers/net/ethernet/intel/idpf/idpf_lib.c | 2 -- .../net/ethernet/intel/idpf/idpf_virtchnl.c | 31 ++++++------------- 3 files changed, 10 insertions(+), 25 deletions(-) diff --git a/drivers/net/ethernet/intel/idpf/idpf.h b/drivers/net/ethernet/= intel/idpf/idpf.h index 47931b7593eb..0c8fc4c1e927 100644 --- a/drivers/net/ethernet/intel/idpf/idpf.h +++ b/drivers/net/ethernet/intel/idpf/idpf.h @@ -568,7 +568,6 @@ struct idpf_vc_xn_manager; * @avail_queues: Device given queue limits * @vports: Array to store vports created by the driver * @netdevs: Associated Vport netdevs - * @vport_params_reqd: Vport params requested * @vport_params_recvd: Vport params received * @vport_ids: Array of device given vport identifiers * @singleq_pt_lkup: Lookup table for singleq RX ptypes @@ -625,7 +624,6 @@ struct idpf_adapter { struct idpf_avail_queue_info avail_queues; struct idpf_vport **vports; struct net_device **netdevs; - struct virtchnl2_create_vport **vport_params_reqd; struct virtchnl2_create_vport **vport_params_recvd; u32 *vport_ids; =20 diff --git a/drivers/net/ethernet/intel/idpf/idpf_lib.c b/drivers/net/ether= net/intel/idpf/idpf_lib.c index 61448af2ab63..b7eaf39b1647 100644 --- a/drivers/net/ethernet/intel/idpf/idpf_lib.c +++ b/drivers/net/ethernet/intel/idpf/idpf_lib.c @@ -958,8 +958,6 @@ static void idpf_vport_rel(struct idpf_vport *vport) =20 kfree(adapter->vport_params_recvd[idx]); adapter->vport_params_recvd[idx] =3D NULL; - kfree(adapter->vport_params_reqd[idx]); - adapter->vport_params_reqd[idx] =3D NULL; =20 kfree(vport); adapter->num_alloc_vports--; diff --git a/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c b/drivers/net/= ethernet/intel/idpf/idpf_virtchnl.c index bc29503a5f82..b93082b98f3a 100644 --- a/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c +++ b/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c @@ -1307,14 +1307,10 @@ int idpf_send_create_vport_msg(struct idpf_adapter = *adapter, ssize_t reply_sz; =20 buf_size =3D sizeof(struct virtchnl2_create_vport); - if (!adapter->vport_params_reqd[idx]) { - adapter->vport_params_reqd[idx] =3D kzalloc(buf_size, - GFP_KERNEL); - if (!adapter->vport_params_reqd[idx]) - return -ENOMEM; - } + vport_msg =3D kzalloc(buf_size, GFP_KERNEL); + if (!vport_msg) + return -ENOMEM; =20 - vport_msg =3D adapter->vport_params_reqd[idx]; vport_msg->vport_type =3D cpu_to_le16(VIRTCHNL2_VPORT_TYPE_DEFAULT); vport_msg->vport_index =3D cpu_to_le16(idx); =20 @@ -1331,8 +1327,7 @@ int idpf_send_create_vport_msg(struct idpf_adapter *a= dapter, err =3D idpf_vport_calc_total_qs(adapter, idx, vport_msg, max_q); if (err) { dev_err(&adapter->pdev->dev, "Enough queues are not available"); - - return err; + goto rel_buf; } =20 if (!adapter->vport_params_recvd[idx]) { @@ -1340,7 +1335,7 @@ int idpf_send_create_vport_msg(struct idpf_adapter *a= dapter, GFP_KERNEL); if (!adapter->vport_params_recvd[idx]) { err =3D -ENOMEM; - goto free_vport_params; + goto rel_buf; } } =20 @@ -1356,13 +1351,15 @@ int idpf_send_create_vport_msg(struct idpf_adapter = *adapter, goto free_vport_params; } =20 + kfree(vport_msg); + return 0; =20 free_vport_params: kfree(adapter->vport_params_recvd[idx]); adapter->vport_params_recvd[idx] =3D NULL; - kfree(adapter->vport_params_reqd[idx]); - adapter->vport_params_reqd[idx] =3D NULL; +rel_buf: + kfree(vport_msg); =20 return err; } @@ -2845,8 +2842,6 @@ static void idpf_vport_params_buf_rel(struct idpf_ada= pter *adapter) { kfree(adapter->vport_params_recvd); adapter->vport_params_recvd =3D NULL; - kfree(adapter->vport_params_reqd); - adapter->vport_params_reqd =3D NULL; kfree(adapter->vport_ids); adapter->vport_ids =3D NULL; } @@ -2861,17 +2856,11 @@ static int idpf_vport_params_buf_alloc(struct idpf_= adapter *adapter) { u16 num_max_vports =3D idpf_get_max_vports(adapter); =20 - adapter->vport_params_reqd =3D kcalloc(num_max_vports, - sizeof(*adapter->vport_params_reqd), - GFP_KERNEL); - if (!adapter->vport_params_reqd) - return -ENOMEM; - adapter->vport_params_recvd =3D kcalloc(num_max_vports, sizeof(*adapter->vport_params_recvd), GFP_KERNEL); if (!adapter->vport_params_recvd) - goto err_mem; + return -ENOMEM; =20 adapter->vport_ids =3D kcalloc(num_max_vports, sizeof(u32), GFP_KERNEL); if (!adapter->vport_ids) --=20 2.47.0