From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) (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 B1E9B38F25A for ; Fri, 17 Jul 2026 18:53:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.11 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784314429; cv=none; b=bsbMyNIt1ne/btWSuslNs2yl/mSMeCiRucf0HFnRwBjC8WxEMwGT4Xxg9HvrJW1Rr4b/aZE7Y3q0lTxDCRDS9iHJyQQYmUOAPLuQ4Box9ivDcpSHjymk/9ED4NIbyrPRXxcxDjy/cRjFiACxCnNp0vDId11yJWZJm996k20dvUM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784314429; c=relaxed/simple; bh=brNpq3mSAL2VpMEUH9dm9Cr+NxexPGHb+AgFGBPAESs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZMdxoBf6JqyZI0KNHuYFvljzXjcqZhh4iDqjTuTi67aaEBNlYZP6boV/1XCNmTQyK8vGrZ2xuJZeaFzhAUBRqUL9caThpp+MkxHHNe3dlpz0Gzt/0IElAht43+PYs6srpDPw0vjuA0uT4Elx3CKm6906LBxbbUOumsFrEQUf004= 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=h+qt1BNF; arc=none smtp.client-ip=198.175.65.11 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="h+qt1BNF" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1784314428; x=1815850428; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=brNpq3mSAL2VpMEUH9dm9Cr+NxexPGHb+AgFGBPAESs=; b=h+qt1BNFY3M5AJnaM3dbXHgfzK4pz+ll1OEuhDcAMO5+T6LaWj4Nnzd+ jn49B4xvyxWTwaXGXG51JUPcNBf4jB2o+GAJ0aQ28It8C05Bm6LbK2Vd1 9F+pnLG14ZblErx/1pEKIT6cqaBIBIrECzTDc3LfywxMkhNxnCVFrt3QF 7/gh7Ix//KJj1pIEudTNCaB3e4XLoJ6tKGPhOXdkMHa9WC5+IQ2xYKSLA 3SIiGaNLU/fQKxBEwJ5Rn1D60p1lHg4Pm1WTBHqn6ucT990w1Z2GhimM0 qTKKIUIKtqZiNDZ5T3c3Nc3oYBA3uwfsrkd7+trvjNMcX/yGlof2yePl4 A==; X-CSE-ConnectionGUID: n0wGNqu8SAC83n744l6wIQ== X-CSE-MsgGUID: yol6VkleQqiQtI8iBErZFQ== X-IronPort-AV: E=McAfee;i="6800,10657,11849"; a="95347598" X-IronPort-AV: E=Sophos;i="6.25,169,1779174000"; d="scan'208";a="95347598" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Jul 2026 11:53:46 -0700 X-CSE-ConnectionGUID: DRCaa6fpQZS+RbRwbwSUuQ== X-CSE-MsgGUID: eU5QY6gTQxKEYN9UBhIoZQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.25,169,1779174000"; d="scan'208";a="261827229" Received: from anguy11-upstream.jf.intel.com ([10.166.9.133]) by fmviesa005.fm.intel.com with ESMTP; 17 Jul 2026 11:53:45 -0700 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: Michal Swiatkowski , anthony.l.nguyen@intel.com, horms@kernel.org, jramaseu@redhat.com, Aleksandr Loktionov , Rinitha S Subject: [PATCH net 03/13] ice: pass the return value of skb_checksum_help() Date: Fri, 17 Jul 2026 11:53:25 -0700 Message-ID: <20260717185340.3595286-4-anthony.l.nguyen@intel.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20260717185340.3595286-1-anthony.l.nguyen@intel.com> References: <20260717185340.3595286-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 Content-Transfer-Encoding: 8bit From: Michal Swiatkowski skb_checksum_help() can fail. Pass its return value back to the caller. Commonize this software path in goto. Instead of just returning error try calculating software checksum first. There is a check for TSO in checksum_sw_fb. Reviewed-by: Aleksandr Loktionov Signed-off-by: Michal Swiatkowski Tested-by: Rinitha S (A Contingent worker at Intel) Signed-off-by: Tony Nguyen --- drivers/net/ethernet/intel/ice/ice_txrx.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/drivers/net/ethernet/intel/ice/ice_txrx.c b/drivers/net/ethernet/intel/ice/ice_txrx.c index 4ca1a0602307..c04c5856dad6 100644 --- a/drivers/net/ethernet/intel/ice/ice_txrx.c +++ b/drivers/net/ethernet/intel/ice/ice_txrx.c @@ -1654,7 +1654,7 @@ int ice_tx_csum(struct ice_tx_buf *first, struct ice_tx_offload_params *off) ret = ipv6_skip_exthdr(skb, exthdr - skb->data, &l4_proto, &frag_off); if (ret < 0) - return -1; + goto checksum_sw_fb; } /* define outer transport */ @@ -1673,11 +1673,7 @@ int ice_tx_csum(struct ice_tx_buf *first, struct ice_tx_offload_params *off) l4.hdr = skb_inner_network_header(skb); break; default: - if (first->tx_flags & ICE_TX_FLAGS_TSO) - return -1; - - skb_checksum_help(skb); - return 0; + goto checksum_sw_fb; } /* compute outer L3 header size */ @@ -1736,7 +1732,7 @@ int ice_tx_csum(struct ice_tx_buf *first, struct ice_tx_offload_params *off) ipv6_skip_exthdr(skb, exthdr - skb->data, &l4_proto, &frag_off); } else { - return -1; + goto checksum_sw_fb; } /* compute inner L3 header size */ @@ -1789,15 +1785,17 @@ int ice_tx_csum(struct ice_tx_buf *first, struct ice_tx_offload_params *off) break; default: - if (first->tx_flags & ICE_TX_FLAGS_TSO) - return -1; - skb_checksum_help(skb); - return 0; + goto checksum_sw_fb; } off->td_cmd |= cmd; off->td_offset |= offset; return 1; + +checksum_sw_fb: + if (first->tx_flags & ICE_TX_FLAGS_TSO) + return -1; + return skb_checksum_help(skb); } /** -- 2.47.1