From patchwork Tue Feb 11 21:43:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Nguyen X-Patchwork-Id: 13970744 X-Patchwork-Delegate: kuba@kernel.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) (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 367F2267705 for ; Tue, 11 Feb 2025 21:43:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739310231; cv=none; b=oZ+aKMCLoDF/oKHxGTOsVySRA9PUBMdj/iUh9bLfsBEwxIu19aJutCPpwkhIzBQXtiHYbZgedEhBA85HS5Zpapmj/Zg9MrcJhClACIEn/tciXOcGNLNbPN3UjJ1g/bE08BIyx8i6Ac1EnrNKLAfsAXWS0V/+4uuqNTxbgD5Vrzk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739310231; c=relaxed/simple; bh=/Yjv78vpFgTBFjx27sm8wPgmoHwg6vcE3jDcIZDRgV0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=c5ouSfFLG9vqoDisb5uQn7Y2Xh53jQ+yFCUYWB25FJXQp41zJkZIo6I0CYVljhA/kNiQhZGKufuNsaw4mBxO9NQWp3KknyJnXQmMwbM/abzG4tdU3U3IV0kxqt4TySHFBKqJDR05R0kYFsbG4NNs9+6nX5ZGYKeyTCduM8dq/OQ= 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=SVXBmWYH; arc=none smtp.client-ip=192.198.163.18 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="SVXBmWYH" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1739310230; x=1770846230; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=/Yjv78vpFgTBFjx27sm8wPgmoHwg6vcE3jDcIZDRgV0=; b=SVXBmWYHH1ZeZ8g1zxi0UGPQOo7UUSPJNghpx/P7sTkgAe1zBMICXNGe YSRgD+2eHArFki1uC3zGJk7K5jUFmb7+0hDxK9Hm9F41L4BG67ZXtSlcA FlZSFKTTJtslwE/R+1kHXIyGAlTovmV2opbJbBpnQG0az2lp2UXBsJKIl 5Lc2JWcOkXCx5CgYN/IKhGeTFFySNtoEYfYy57gFDOKYaDAfj4n27L5wV GuMUx67lkoBo+Q/YSHWXmPrwSbgTNDphWgPn/kUS86UmcDhEN3/gciXgi Ml6A1w0XZoSZd/7U8TNOviKAMjQfQuW6hncHnPjXYwL4Sgnj20g2ohmgr w==; X-CSE-ConnectionGUID: FhetdRjVRqqcXi1wEcSd3A== X-CSE-MsgGUID: MyznHP/VTXCDf1TBUJwH7w== X-IronPort-AV: E=McAfee;i="6700,10204,11342"; a="39185225" X-IronPort-AV: E=Sophos;i="6.13,278,1732608000"; d="scan'208";a="39185225" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Feb 2025 13:43:48 -0800 X-CSE-ConnectionGUID: BWIp6exQS5OE9cn8YiTeEw== X-CSE-MsgGUID: SH5QtbybRzauyTAmKa/ToA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.13,278,1732608000"; d="scan'208";a="143478668" Received: from anguy11-upstream.jf.intel.com ([10.166.9.133]) by orviesa002.jf.intel.com with ESMTP; 11 Feb 2025 13:43:48 -0800 From: Tony Nguyen To: davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, edumazet@google.com, andrew+netdev@lunn.ch, netdev@vger.kernel.org Cc: Sridhar Samudrala , anthony.l.nguyen@intel.com, willemb@google.com, Przemek Kitszel , Samuel Salin Subject: [PATCH net 1/6] idpf: fix handling rsc packet with a single segment Date: Tue, 11 Feb 2025 13:43:32 -0800 Message-ID: <20250211214343.4092496-2-anthony.l.nguyen@intel.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250211214343.4092496-1-anthony.l.nguyen@intel.com> References: <20250211214343.4092496-1-anthony.l.nguyen@intel.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org From: Sridhar Samudrala Handle rsc packet with a single segment same as a multi segment rsc packet so that CHECKSUM_PARTIAL is set in the skb->ip_summed field. The current code is passing CHECKSUM_NONE resulting in TCP GRO layer doing checksum in SW and hiding the issue. This will fail when using dmabufs as payload buffers as skb frag would be unreadable. Fixes: 3a8845af66ed ("idpf: add RX splitq napi poll support") Signed-off-by: Sridhar Samudrala Reviewed-by: Przemek Kitszel Tested-by: Samuel Salin Signed-off-by: Tony Nguyen --- drivers/net/ethernet/intel/idpf/idpf_txrx.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/net/ethernet/intel/idpf/idpf_txrx.c b/drivers/net/ethernet/intel/idpf/idpf_txrx.c index 2fa9c36e33c9..c9fcf8f4d736 100644 --- a/drivers/net/ethernet/intel/idpf/idpf_txrx.c +++ b/drivers/net/ethernet/intel/idpf/idpf_txrx.c @@ -3008,8 +3008,6 @@ static int idpf_rx_rsc(struct idpf_rx_queue *rxq, struct sk_buff *skb, return -EINVAL; rsc_segments = DIV_ROUND_UP(skb->data_len, rsc_seg_len); - if (unlikely(rsc_segments == 1)) - return 0; NAPI_GRO_CB(skb)->count = rsc_segments; skb_shinfo(skb)->gso_size = rsc_seg_len; From patchwork Tue Feb 11 21:43:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Nguyen X-Patchwork-Id: 13970745 X-Patchwork-Delegate: kuba@kernel.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) (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 0954A2676CF for ; Tue, 11 Feb 2025 21:43:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739310233; cv=none; b=E0hecXX+W5LQGsLOvNmTYHE5zQuBAs8cHSpIAqaG5lwIkh1HwiDk/2CVdUdrDNqJlAWarces5DSYqCqDeGHxWKF7h6AMHI7e971Q2uWsxfdI1JWzEgsvVlCFoc+gsE4G0FBwC9biy/ct58qB63PacXtmMS9GNCANb5cpxmGcnlE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739310233; c=relaxed/simple; bh=Rqa9O0ziKvlfMkm/ts/fxnbn3U4A8kR7qqz/Z4OI2u8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Cgyqh8o9Lxpgp341lihsZqafwPlwff2FqrfZCUrAUrUKGiGGQefRx1ALRMCxkVC+tg3zuO38UzFZgHypgCDJvDr7KFKC+zseYnxtM08lYJv0o1CIK0p3zmKTM985fs/U3yLXHAgNS4yTS3n+DY6rcqimFuIw6rD0TkwApl2dpBU= 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=L8xCUMHU; arc=none smtp.client-ip=192.198.163.18 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="L8xCUMHU" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1739310232; x=1770846232; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Rqa9O0ziKvlfMkm/ts/fxnbn3U4A8kR7qqz/Z4OI2u8=; b=L8xCUMHUsWfc+PdnehNSx3UPkCGAPNpXraLea61/FlUYEFGKYLKTWo55 QntZvQGs5Lq+nlFZPRGZ8NOc6Co7TfNJaNUpH1+/OxFh/0orBrqmCT1Fw OiGNgtbiCb/S8PopE6fMC5jaJXtR9a+KbDU7YuXRbSW9XbiG6dNopmBJ9 IRpwVYmVMnwxwHWGg2f9+wf5wghYtxEqKL/uHmYEdC1VS8OiscQp1xK/a ueFGT3BwzwZxBQ4LUSLZ0DRVUzXEQYBY4DN3VvWnnV4Xb0p24aK26Zn72 ovqMyPE/jJjYxY/dppCz5CAORDiGQpYXbnFBXq81f3bIWzlzwjN7FCEw5 Q==; X-CSE-ConnectionGUID: td3LbpsrSOSMUVeaFkqdZQ== X-CSE-MsgGUID: b2Mj3bpiRVGOeALa+vkD8g== X-IronPort-AV: E=McAfee;i="6700,10204,11342"; a="39185231" X-IronPort-AV: E=Sophos;i="6.13,278,1732608000"; d="scan'208";a="39185231" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Feb 2025 13:43:48 -0800 X-CSE-ConnectionGUID: DHIwCSS5SEaITMBpmWMY7w== X-CSE-MsgGUID: EjwKKtH/Tfi21Jjn71MHNw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.13,278,1732608000"; d="scan'208";a="143478671" Received: from anguy11-upstream.jf.intel.com ([10.166.9.133]) by orviesa002.jf.intel.com with ESMTP; 11 Feb 2025 13:43:48 -0800 From: Tony Nguyen To: davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, edumazet@google.com, andrew+netdev@lunn.ch, netdev@vger.kernel.org Cc: Sridhar Samudrala , anthony.l.nguyen@intel.com, Madhu Chittim , Samuel Salin Subject: [PATCH net 2/6] idpf: record rx queue in skb for RSC packets Date: Tue, 11 Feb 2025 13:43:33 -0800 Message-ID: <20250211214343.4092496-3-anthony.l.nguyen@intel.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250211214343.4092496-1-anthony.l.nguyen@intel.com> References: <20250211214343.4092496-1-anthony.l.nguyen@intel.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org From: Sridhar Samudrala Move the call to skb_record_rx_queue in idpf_rx_process_skb_fields() so that RX queue is recorded for RSC packets too. Fixes: 90912f9f4f2d ("idpf: convert header split mode to libeth + napi_build_skb()") Signed-off-by: Sridhar Samudrala Reviewed-by: Madhu Chittim Tested-by: Samuel Salin Signed-off-by: Tony Nguyen --- drivers/net/ethernet/intel/idpf/idpf_txrx.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/ethernet/intel/idpf/idpf_txrx.c b/drivers/net/ethernet/intel/idpf/idpf_txrx.c index c9fcf8f4d736..9be6a6b59c4e 100644 --- a/drivers/net/ethernet/intel/idpf/idpf_txrx.c +++ b/drivers/net/ethernet/intel/idpf/idpf_txrx.c @@ -3070,6 +3070,7 @@ idpf_rx_process_skb_fields(struct idpf_rx_queue *rxq, struct sk_buff *skb, idpf_rx_hash(rxq, skb, rx_desc, decoded); skb->protocol = eth_type_trans(skb, rxq->netdev); + skb_record_rx_queue(skb, rxq->idx); if (le16_get_bits(rx_desc->hdrlen_flags, VIRTCHNL2_RX_FLEX_DESC_ADV_RSC_M)) @@ -3078,8 +3079,6 @@ idpf_rx_process_skb_fields(struct idpf_rx_queue *rxq, struct sk_buff *skb, csum_bits = idpf_rx_splitq_extract_csum_bits(rx_desc); idpf_rx_csum(rxq, skb, csum_bits, decoded); - skb_record_rx_queue(skb, rxq->idx); - return 0; } From patchwork Tue Feb 11 21:43:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Nguyen X-Patchwork-Id: 13970748 X-Patchwork-Delegate: kuba@kernel.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) (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 9C8FF26771F for ; Tue, 11 Feb 2025 21:43:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739310237; cv=none; b=l0xc4qiehUQdlaXGcUSmVRPLzKWGS17zGZLe+tCWwF8tXyVq8urQOVvK7Fj6RqzgHYaZQun27KG5KNH7BywOec6JNJZwpGLtNI4dXYQcslI/mIp7G1ZDB+SGMOAztYv98OLJkKlegn1Q3r2jElokjCTY2ZWiiQOpPwc2YKJ8cNU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739310237; c=relaxed/simple; bh=y4RwuGwz9BcGpNkOBfK3U3ajwbJ39wD71zctil4z4p0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BuPzaWOcoa5vv9Kb7GXbRwzsSX/7rhio7lsJKjF2lKdQwUURc6PZDS1wHdKsNC4iTqYHbRtnIJlql7u0tJ97YZGG3DSJs/MBXQYgCZLYJv8SBrTyourNRoXd2+RClaMq1WVG516ZLkUvGNBVEn98ZmtjrOfyLudTTMfU9OokrSc= 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=T0XNwxog; arc=none smtp.client-ip=192.198.163.18 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="T0XNwxog" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1739310235; x=1770846235; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=y4RwuGwz9BcGpNkOBfK3U3ajwbJ39wD71zctil4z4p0=; b=T0XNwxogFqKveAKoQi2QFBx8ikWH69snpDMf+HiCw/QlgkLgdwE1BrPT QF+HjG59zBrsnS91BoADhsl87JKaB80oDHJBOqzOHueSf9db84Dqo7B1A cEpFK8ABNa8BUiwlo0wSdyfsZ/9StJ7rSDjPvIjE7ns7JVKoIaDOdZIlW 5vhTzICL9CPmCn4py8kwm+cY45m1OjFkfv9argcTRtK2+oFRi0cFBvGUL 3tsYLKGESdOCbPccvCbPqGkLa6OzfJCzfEFlcaNOA+KREnCYeAvYCtkY0 3NF7Pj5D9O0ek1uOyzmKWYCU5doJasxKLdLn71ezWh+DxMVkZNJqSEQ9O g==; X-CSE-ConnectionGUID: TVtH2MzpSgKWghdVHzFakA== X-CSE-MsgGUID: GdTA/vC9QI6shoTfD7q6cA== X-IronPort-AV: E=McAfee;i="6700,10204,11342"; a="39185237" X-IronPort-AV: E=Sophos;i="6.13,278,1732608000"; d="scan'208";a="39185237" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Feb 2025 13:43:49 -0800 X-CSE-ConnectionGUID: sSySMl6YQbCnCEthHtnO6w== X-CSE-MsgGUID: Q9GxTBRkQAuiD3WJE//+Ww== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.13,278,1732608000"; d="scan'208";a="143478674" Received: from anguy11-upstream.jf.intel.com ([10.166.9.133]) by orviesa002.jf.intel.com with ESMTP; 11 Feb 2025 13:43:49 -0800 From: Tony Nguyen To: davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, edumazet@google.com, andrew+netdev@lunn.ch, netdev@vger.kernel.org Cc: Joshua Hay , anthony.l.nguyen@intel.com, aleksander.lobakin@intel.com, Madhu Chittim , Samuel Salin Subject: [PATCH net 3/6] idpf: call set_real_num_queues in idpf_open Date: Tue, 11 Feb 2025 13:43:34 -0800 Message-ID: <20250211214343.4092496-4-anthony.l.nguyen@intel.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250211214343.4092496-1-anthony.l.nguyen@intel.com> References: <20250211214343.4092496-1-anthony.l.nguyen@intel.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org From: Joshua Hay On initial driver load, alloc_etherdev_mqs is called with whatever max queue values are provided by the control plane. However, if the driver is loaded on a system where num_online_cpus() returns less than the max queues, the netdev will think there are more queues than are actually available. Only num_online_cpus() will be allocated, but skb_get_queue_mapping(skb) could possibly return an index beyond the range of allocated queues. Consequently, the packet is silently dropped and it appears as if TX is broken. Set the real number of queues during open so the netdev knows how many queues will be allocated. Fixes: 1c325aac10a8 ("idpf: configure resources for TX queues") Signed-off-by: Joshua Hay Reviewed-by: Madhu Chittim Tested-by: Samuel Salin Signed-off-by: Tony Nguyen --- drivers/net/ethernet/intel/idpf/idpf_lib.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/ethernet/intel/idpf/idpf_lib.c b/drivers/net/ethernet/intel/idpf/idpf_lib.c index b4fbb99bfad2..a3d6b8f198a8 100644 --- a/drivers/net/ethernet/intel/idpf/idpf_lib.c +++ b/drivers/net/ethernet/intel/idpf/idpf_lib.c @@ -2159,8 +2159,13 @@ static int idpf_open(struct net_device *netdev) idpf_vport_ctrl_lock(netdev); vport = idpf_netdev_to_vport(netdev); + err = idpf_set_real_num_queues(vport); + if (err) + goto unlock; + err = idpf_vport_open(vport); +unlock: idpf_vport_ctrl_unlock(netdev); return err; From patchwork Tue Feb 11 21:43:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Nguyen X-Patchwork-Id: 13970730 X-Patchwork-Delegate: kuba@kernel.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) (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 C2E7C263F3F; Tue, 11 Feb 2025 21:43:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739310235; cv=none; b=daqoCDGfr1m1O/cDwVtszo06GFZBvTie1aBNy+j8sQnj5frs4y5hj5Nqa6KOcjyEN8AQFhaT2UT6ltPIpnQ3pPp+8DJXH+qLh4FQvUBJdNGUQuEZmZtIUXtgYyq/8TV7t0MxpcVKHMQ9Ep3W+BbtiHxdsepgYs3pz2FRlB7tJvU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739310235; c=relaxed/simple; bh=U/UHenFl0UILNVEOoSUdTTH1ha9BJCNFmKk+4XYtxW4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KDB3CPxlf1tReRKW0jD/a1O9HYJHN2BVs3UrLVVDI63GCN43+y8M96e70GmQrXwuR2xoIFCtmmC7IJ+F553hWn3OdRoQDzvz/AS6wclfOCnt8TMNh8cc3PG8FkpTC8TpuZ+Oen9jH/qP5PiX0Aepv2ciV/f4hxHMXTUN0j3QbUo= 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=bBO1IAZV; arc=none smtp.client-ip=192.198.163.18 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="bBO1IAZV" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1739310233; x=1770846233; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=U/UHenFl0UILNVEOoSUdTTH1ha9BJCNFmKk+4XYtxW4=; b=bBO1IAZVTqdC7GgGduo7C6wiRJJvPBFsFLEulWjsQWrQ5xilLA5bHVAo PXXXByTqXCYUMUOYO2+/ejKdz8ZN4f9Tbag3JKd5m1fhTjz+UPt/uS+cN U0zY/+K12rZRCGbiPaibHuokVIT/qnDnKYrCsM0xZtfA5tAA8vzWEDpfO KFqCht7NgWP1K8/0b6A4ktH2xb1Q8w9hXU2Q+x8cGFbe8QIrPXKN62Khm pUbO0tJDZHPv+23y9MiZ1Jceb0qQ4w6C5k0OdoGO7bXup+ffycFx9vfnb 5bPsNb7xQR/gjxxrhLKSspP4BkgMfBYC4/SmvxJSJQ8DXOyjrmHMgrne9 A==; X-CSE-ConnectionGUID: bkLdVgK2Q7GkwQREa4SzrQ== X-CSE-MsgGUID: L93tV3LdTTG1nbu/dnMgqw== X-IronPort-AV: E=McAfee;i="6700,10204,11342"; a="39185243" X-IronPort-AV: E=Sophos;i="6.13,278,1732608000"; d="scan'208";a="39185243" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Feb 2025 13:43:49 -0800 X-CSE-ConnectionGUID: u7ez2ZUqRYmugVfQGi6bQg== X-CSE-MsgGUID: OP/XXeu4RcORaUJdENUXCw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.13,278,1732608000"; d="scan'208";a="143478678" Received: from anguy11-upstream.jf.intel.com ([10.166.9.133]) by orviesa002.jf.intel.com with ESMTP; 11 Feb 2025 13:43:49 -0800 From: Tony Nguyen To: davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, edumazet@google.com, andrew+netdev@lunn.ch, netdev@vger.kernel.org Cc: Piotr Kwapulinski , anthony.l.nguyen@intel.com, przemyslaw.kitszel@intel.com, maciej.fijalkowski@intel.com, magnus.karlsson@intel.com, ast@kernel.org, daniel@iogearbox.net, hawk@kernel.org, john.fastabend@gmail.com, bpf@vger.kernel.org, horms@kernel.org, yuehaibing@huawei.com, dan.carpenter@linaro.org, Saritha Sanigani Subject: [PATCH net 4/6] ixgbe: Fix possible skb NULL pointer dereference Date: Tue, 11 Feb 2025 13:43:35 -0800 Message-ID: <20250211214343.4092496-5-anthony.l.nguyen@intel.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250211214343.4092496-1-anthony.l.nguyen@intel.com> References: <20250211214343.4092496-1-anthony.l.nguyen@intel.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org From: Piotr Kwapulinski The commit c824125cbb18 ("ixgbe: Fix passing 0 to ERR_PTR in ixgbe_run_xdp()") stopped utilizing the ERR-like macros for xdp status encoding. Propagate this logic to the ixgbe_put_rx_buffer(). The commit also relaxed the skb NULL pointer check - caught by Smatch. Restore this check. Fixes: c824125cbb18 ("ixgbe: Fix passing 0 to ERR_PTR in ixgbe_run_xdp()") Reported-by: Dan Carpenter Closes: https://lore.kernel.org/intel-wired-lan/2c7d6c31-192a-4047-bd90-9566d0e14cc0@stanley.mountain/ Acked-by: Maciej Fijalkowski Signed-off-by: Piotr Kwapulinski Reviewed-by: Simon Horman Tested-by: Saritha Sanigani (A Contingent Worker at Intel) Signed-off-by: Tony Nguyen --- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index 7236f20c9a30..467f81239e12 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -2105,7 +2105,7 @@ static void ixgbe_put_rx_buffer(struct ixgbe_ring *rx_ring, /* hand second half of page back to the ring */ ixgbe_reuse_rx_page(rx_ring, rx_buffer); } else { - if (!IS_ERR(skb) && IXGBE_CB(skb)->dma == rx_buffer->dma) { + if (skb && IXGBE_CB(skb)->dma == rx_buffer->dma) { /* the page has been released from the ring */ IXGBE_CB(skb)->page_released = true; } else { From patchwork Tue Feb 11 21:43:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Nguyen X-Patchwork-Id: 13970731 X-Patchwork-Delegate: kuba@kernel.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) (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 91A4F268C55; Tue, 11 Feb 2025 21:43:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739310236; cv=none; b=phdZcX/CPtSsPA0SpY0gDI7+d2oVRAd4xShVbOtLagO34Woh7Tu9rp5++iR2upWhrOnXr187ET+SvlTsznrYdHGK2CYC9+Zb5uTbqMzwPNSj2sUU1j3dYiHrhEa5yf0uu21BfoHCKj9grvNF7p2tJwY6ZslV3uthgSqlVTfmLeI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739310236; c=relaxed/simple; bh=Y9JP1Z1HkgTXXFYGrxS4/bDS4hQxSsHx+Oa2jzlCRxk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iA+E5kNyd0ZodV3jGYFuLlEMj+WVpIJKvdD5vJ8fNbk1vY1ZiZan9C+g5TTgWV/8lPEd8Qb/BWund0yP6d6RgJOvkS18nmmf8hW7Pa2bcYZa1oek7LbqwgBqVz8hSho9VtnLcEpgH8RzAFAvq7VCHzbPUj1Ia1tZMzU30R/HVK8= 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=QocOpalk; arc=none smtp.client-ip=192.198.163.18 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="QocOpalk" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1739310234; x=1770846234; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Y9JP1Z1HkgTXXFYGrxS4/bDS4hQxSsHx+Oa2jzlCRxk=; b=QocOpalkjH5ogUbFvIdgzuCgwbTgeweB+ZZyEfo3NJ83ocZu8SEHQj7w Iwc5lfT/My8yRW49LholS0R+8G87PGF6KeVWA5znE3PoFHsbY8stQI0UF ranwFpYY+AGdMmxDls14XmGjDousIBt7cBZzVz1HZtF44geV85IVLD1L9 mlH4tkaurEZfHvN0vxszFfOyGvAS/KZ5qO8xwqZ6Z2W1hLPoJkWHahP68 cYA3ha82wUvB1yHyGAc5r6O4B2h5k+5vFZQcMLloU9b7t/v5Ol8KlJf9A W8pfk6X+11uKIkGOWPU64qupWcGWtnmwZ2f8rYx0Uw6r0sDT55tIktmNf g==; X-CSE-ConnectionGUID: KmZZvbFXRyWAO6oS+jRYrQ== X-CSE-MsgGUID: 3kEyvkhRQcGJ8qo9PxTvvw== X-IronPort-AV: E=McAfee;i="6700,10204,11342"; a="39185254" X-IronPort-AV: E=Sophos;i="6.13,278,1732608000"; d="scan'208";a="39185254" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Feb 2025 13:43:49 -0800 X-CSE-ConnectionGUID: TYBtCpAPSYK51OGpi4j4Pg== X-CSE-MsgGUID: qLovqWOzQSqRXjuaIN1rCA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.13,278,1732608000"; d="scan'208";a="143478681" Received: from anguy11-upstream.jf.intel.com ([10.166.9.133]) by orviesa002.jf.intel.com with ESMTP; 11 Feb 2025 13:43:49 -0800 From: Tony Nguyen To: davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, edumazet@google.com, andrew+netdev@lunn.ch, netdev@vger.kernel.org Cc: Zdenek Bouska , anthony.l.nguyen@intel.com, przemyslaw.kitszel@intel.com, vitaly.lifshits@intel.com, dima.ruinskiy@intel.com, maciej.fijalkowski@intel.com, magnus.karlsson@intel.com, ast@kernel.org, daniel@iogearbox.net, hawk@kernel.org, john.fastabend@gmail.com, bpf@vger.kernel.org, jan.kiszka@siemens.com, florian.bezdeka@siemens.com, Vinicius Costa Gomes , Simon Horman , Song Yoong Siang , Mor Bar-Gabay Subject: [PATCH net 5/6] igc: Fix HW RX timestamp when passed by ZC XDP Date: Tue, 11 Feb 2025 13:43:36 -0800 Message-ID: <20250211214343.4092496-6-anthony.l.nguyen@intel.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250211214343.4092496-1-anthony.l.nguyen@intel.com> References: <20250211214343.4092496-1-anthony.l.nguyen@intel.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org From: Zdenek Bouska Fixes HW RX timestamp in the following scenario: - AF_PACKET socket with enabled HW RX timestamps is created - AF_XDP socket with enabled zero copy is created - frame is forwarded to the BPF program, where the timestamp should still be readable (extracted by igc_xdp_rx_timestamp(), kfunc behind bpf_xdp_metadata_rx_timestamp()) - the frame got XDP_PASS from BPF program, redirecting to the stack - AF_PACKET socket receives the frame with HW RX timestamp Moves the skb timestamp setting from igc_dispatch_skb_zc() to igc_construct_skb_zc() so that igc_construct_skb_zc() is similar to igc_construct_skb(). This issue can also be reproduced by running: # tools/testing/selftests/bpf/xdp_hw_metadata enp1s0 When a frame with the wrong port 9092 (instead of 9091) is used: # echo -n xdp | nc -u -q1 192.168.10.9 9092 then the RX timestamp is missing and xdp_hw_metadata prints: skb hwtstamp is not found! With this fix or when copy mode is used: # tools/testing/selftests/bpf/xdp_hw_metadata -c enp1s0 then RX timestamp is found and xdp_hw_metadata prints: found skb hwtstamp = 1736509937.852786132 Fixes: 069b142f5819 ("igc: Add support for PTP .getcyclesx64()") Signed-off-by: Zdenek Bouska Acked-by: Vinicius Costa Gomes Reviewed-by: Simon Horman Reviewed-by: Florian Bezdeka Reviewed-by: Song Yoong Siang Tested-by: Mor Bar-Gabay Signed-off-by: Tony Nguyen --- drivers/net/ethernet/intel/igc/igc_main.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c index 56a35d58e7a6..21f318f12a8d 100644 --- a/drivers/net/ethernet/intel/igc/igc_main.c +++ b/drivers/net/ethernet/intel/igc/igc_main.c @@ -2701,8 +2701,9 @@ static int igc_clean_rx_irq(struct igc_q_vector *q_vector, const int budget) } static struct sk_buff *igc_construct_skb_zc(struct igc_ring *ring, - struct xdp_buff *xdp) + struct igc_xdp_buff *ctx) { + struct xdp_buff *xdp = &ctx->xdp; unsigned int totalsize = xdp->data_end - xdp->data_meta; unsigned int metasize = xdp->data - xdp->data_meta; struct sk_buff *skb; @@ -2721,27 +2722,28 @@ static struct sk_buff *igc_construct_skb_zc(struct igc_ring *ring, __skb_pull(skb, metasize); } + if (ctx->rx_ts) { + skb_shinfo(skb)->tx_flags |= SKBTX_HW_TSTAMP_NETDEV; + skb_hwtstamps(skb)->netdev_data = ctx->rx_ts; + } + return skb; } static void igc_dispatch_skb_zc(struct igc_q_vector *q_vector, union igc_adv_rx_desc *desc, - struct xdp_buff *xdp, - ktime_t timestamp) + struct igc_xdp_buff *ctx) { struct igc_ring *ring = q_vector->rx.ring; struct sk_buff *skb; - skb = igc_construct_skb_zc(ring, xdp); + skb = igc_construct_skb_zc(ring, ctx); if (!skb) { ring->rx_stats.alloc_failed++; set_bit(IGC_RING_FLAG_RX_ALLOC_FAILED, &ring->flags); return; } - if (timestamp) - skb_hwtstamps(skb)->hwtstamp = timestamp; - if (igc_cleanup_headers(ring, desc, skb)) return; @@ -2777,7 +2779,6 @@ static int igc_clean_rx_irq_zc(struct igc_q_vector *q_vector, const int budget) union igc_adv_rx_desc *desc; struct igc_rx_buffer *bi; struct igc_xdp_buff *ctx; - ktime_t timestamp = 0; unsigned int size; int res; @@ -2807,6 +2808,8 @@ static int igc_clean_rx_irq_zc(struct igc_q_vector *q_vector, const int budget) */ bi->xdp->data_meta += IGC_TS_HDR_LEN; size -= IGC_TS_HDR_LEN; + } else { + ctx->rx_ts = NULL; } bi->xdp->data_end = bi->xdp->data + size; @@ -2815,7 +2818,7 @@ static int igc_clean_rx_irq_zc(struct igc_q_vector *q_vector, const int budget) res = __igc_xdp_run_prog(adapter, prog, bi->xdp); switch (res) { case IGC_XDP_PASS: - igc_dispatch_skb_zc(q_vector, desc, bi->xdp, timestamp); + igc_dispatch_skb_zc(q_vector, desc, ctx); fallthrough; case IGC_XDP_CONSUMED: xsk_buff_free(bi->xdp); From patchwork Tue Feb 11 21:43:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Nguyen X-Patchwork-Id: 13970747 X-Patchwork-Delegate: kuba@kernel.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) (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 817F2268C6A; Tue, 11 Feb 2025 21:43:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739310237; cv=none; b=IT/thKd6mDoT4Oe+Dz/m8uid+IRi81NSqPKv0lFJZHWm7FeFDd60n5tekWrWJvCNbHBbo8qhwjTg1CpaaZyqxrtjNKOTPSeyi7mnkvQrT8AR9s6DPYghp3TvcjddMT64x/TSwVt1q5UvDhjSANEzoG720KKzoLtr6/tU3kKOfjc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739310237; c=relaxed/simple; bh=d9zeaMR664NzUXf6EBUiewejYWNnTZCHSt+tZuySPb0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hPCImUU8bBFDmKTTqhxsGsV2i+SnEp271ZZBVoxMhYmwSOdWx3y4N2fLOveYMhSB/sdx6U4CpddFZXCO4G9LtgmskxHYft0qTfAYz1U9/BIrXReOPYemfZJgjL02D3sNQcrS9EkUXSu16ONNi6TYIDZHnNGallisDmkLV9xISvw= 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=Tkj48yUe; arc=none smtp.client-ip=192.198.163.18 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="Tkj48yUe" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1739310235; x=1770846235; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=d9zeaMR664NzUXf6EBUiewejYWNnTZCHSt+tZuySPb0=; b=Tkj48yUeubkhdpY/QrpFxtgJJlMMxuHHqBjVbFK+4BuZuXCl/nxFiI6v 32HyhXvRCx7omVe04o3Sy5s/lBUfXxSXrRAbNQ+2Uxk6nda3XrbDl4WVL jA4qIrRRxfQniGd34gach93x0pxTZ0n42APUCd+/k+1FKy9zx2BNFssBl 6iA3UPrMH5/TcN8JV0bCCMX2lyqI9bZgDOvvK1HWD9qrJGTK86Ep7OZrg kTASaNk8CLZykK3MCfhT9gW8wjJwy+eEmmJxPB1KllIDkWJU+UG9V1r8b s3u7xdfiH+GCCGJcVfjr8KgwhtyFQh//hGm7Vv9hV27G7qVBNSbqZB8Qz g==; X-CSE-ConnectionGUID: qjvqGWWORVGtLhX4tSXP1A== X-CSE-MsgGUID: S2EPNpZ+Scm+zkM6W5NhSw== X-IronPort-AV: E=McAfee;i="6700,10204,11342"; a="39185260" X-IronPort-AV: E=Sophos;i="6.13,278,1732608000"; d="scan'208";a="39185260" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Feb 2025 13:43:49 -0800 X-CSE-ConnectionGUID: MApgYnpDTa+vfRVKFQ9z+A== X-CSE-MsgGUID: 5ivteSjPTySvVIVu6FF92A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.13,278,1732608000"; d="scan'208";a="143478684" Received: from anguy11-upstream.jf.intel.com ([10.166.9.133]) by orviesa002.jf.intel.com with ESMTP; 11 Feb 2025 13:43:49 -0800 From: Tony Nguyen To: davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, edumazet@google.com, andrew+netdev@lunn.ch, netdev@vger.kernel.org Cc: Song Yoong Siang , anthony.l.nguyen@intel.com, przemyslaw.kitszel@intel.com, vitaly.lifshits@intel.com, dima.ruinskiy@intel.com, vinicius.gomes@intel.com, stable@vger.kernel.org, Maciej Fijalkowski , Simon Horman , Mor Bar-Gabay Subject: [PATCH net 6/6] igc: Set buffer type for empty frames in igc_init_empty_frame Date: Tue, 11 Feb 2025 13:43:37 -0800 Message-ID: <20250211214343.4092496-7-anthony.l.nguyen@intel.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250211214343.4092496-1-anthony.l.nguyen@intel.com> References: <20250211214343.4092496-1-anthony.l.nguyen@intel.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org From: Song Yoong Siang Set the buffer type to IGC_TX_BUFFER_TYPE_SKB for empty frame in the igc_init_empty_frame function. This ensures that the buffer type is correctly identified and handled during Tx ring cleanup. Fixes: db0b124f02ba ("igc: Enhance Qbv scheduling by using first flag bit") Cc: stable@vger.kernel.org # 6.2+ Signed-off-by: Song Yoong Siang Acked-by: Maciej Fijalkowski Reviewed-by: Simon Horman Tested-by: Mor Bar-Gabay Signed-off-by: Tony Nguyen --- drivers/net/ethernet/intel/igc/igc_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c index 21f318f12a8d..84307bb7313e 100644 --- a/drivers/net/ethernet/intel/igc/igc_main.c +++ b/drivers/net/ethernet/intel/igc/igc_main.c @@ -1096,6 +1096,7 @@ static int igc_init_empty_frame(struct igc_ring *ring, return -ENOMEM; } + buffer->type = IGC_TX_BUFFER_TYPE_SKB; buffer->skb = skb; buffer->protocol = 0; buffer->bytecount = skb->len;