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 X-Spam-Level: X-Spam-Status: No, score=-8.4 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6136CC47404 for ; Fri, 11 Oct 2019 16:19:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2EC36206A1 for ; Fri, 11 Oct 2019 16:19:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=akamai.com header.i=@akamai.com header.b="dNLoVlsR" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728167AbfJKQTs (ORCPT ); Fri, 11 Oct 2019 12:19:48 -0400 Received: from mx0b-00190b01.pphosted.com ([67.231.157.127]:39518 "EHLO mx0b-00190b01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726692AbfJKQTs (ORCPT ); Fri, 11 Oct 2019 12:19:48 -0400 Received: from pps.filterd (m0050102.ppops.net [127.0.0.1]) by m0050102.ppops.net-00190b01. (8.16.0.42/8.16.0.42) with SMTP id x9BGHduf014150; Fri, 11 Oct 2019 17:18:34 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akamai.com; h=subject : to : cc : references : from : message-id : date : mime-version : in-reply-to : content-type : content-transfer-encoding; s=jan2016.eng; bh=L1ICpoXk7H5dhkeuAtzhSxdm34DamlfO7tWqyE6fQpA=; b=dNLoVlsRUaDJIDSpFwkeoxxnParQ7GJjXYWwXEmqbEzRSzoFgNWDYva9f3kjXZqiAJO9 winlMDuobrrt1qGJgl8FyQVf44vx1bR+64Rxod80NxftcagfKEJNKVs5TpGKmW4zAP0c N0FYvL3kd52irI71BBmKzcmx4DyPvEIpg/IXFRToMLvVjItoQHyW76+8xD+R2kDno7J7 qpaDOBYLFhF4I8GVCdww4qIaEa9draWbSdqfnZqFGlLx0bfUxkBieoIW2uGLkzPciKPA g+p59BsPLIYi9t+9svvMje5saQ+ynVL7OkzYwZGtQDS9nxcZzChjlWjB8w21g3Np+VTp 2g== Received: from prod-mail-ppoint3 (prod-mail-ppoint3.akamai.com [96.6.114.86] (may be forged)) by m0050102.ppops.net-00190b01. with ESMTP id 2veg8fqrvq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 11 Oct 2019 17:18:34 +0100 Received: from pps.filterd (prod-mail-ppoint3.akamai.com [127.0.0.1]) by prod-mail-ppoint3.akamai.com (8.16.0.27/8.16.0.27) with SMTP id x9BGHPaJ030946; Fri, 11 Oct 2019 12:18:33 -0400 Received: from prod-mail-relay15.akamai.com ([172.27.17.40]) by prod-mail-ppoint3.akamai.com with ESMTP id 2veph1bmp6-1; Fri, 11 Oct 2019 12:18:33 -0400 Received: from [0.0.0.0] (caldecot.sanmateo.corp.akamai.com [172.22.187.166]) by prod-mail-relay15.akamai.com (Postfix) with ESMTP id 938AF2006B; Fri, 11 Oct 2019 16:18:32 +0000 (GMT) Subject: Re: [PATCH v2 1/3] igb: Add UDP segmentation offload support To: Alexander Duyck , netdev@vger.kernel.org, intel-wired-lan@lists.osuosl.org, jeffrey.t.kirsher@intel.com Cc: willemb@google.com, sridhar.samudrala@intel.com, aaron.f.brown@intel.com References: <1570753502-6014-1-git-send-email-johunt@akamai.com> <1570753502-6014-2-git-send-email-johunt@akamai.com> From: Josh Hunt Message-ID: <0ff6df40-d9cc-0b4c-6f1f-df4b39c3f3e3@akamai.com> Date: Fri, 11 Oct 2019 09:18:32 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-10-11_09:,, signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1908290000 definitions=main-1910110147 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.95,1.0.8 definitions=2019-10-11_09:2019-10-10,2019-10-11 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 lowpriorityscore=0 malwarescore=0 impostorscore=0 phishscore=0 priorityscore=1501 clxscore=1015 mlxlogscore=999 suspectscore=0 bulkscore=0 adultscore=0 mlxscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-1908290000 definitions=main-1910110147 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On 10/11/19 8:29 AM, Alexander Duyck wrote: > On Thu, 2019-10-10 at 20:25 -0400, Josh Hunt wrote: >> Based on a series from Alexander Duyck this change adds UDP segmentation >> offload support to the igb driver. >> >> CC: Alexander Duyck >> CC: Willem de Bruijn >> Signed-off-by: Josh Hunt >> --- >> drivers/net/ethernet/intel/igb/e1000_82575.h | 1 + >> drivers/net/ethernet/intel/igb/igb_main.c | 23 +++++++++++++++++------ >> 2 files changed, 18 insertions(+), 6 deletions(-) >> >> diff --git a/drivers/net/ethernet/intel/igb/e1000_82575.h b/drivers/net/ethernet/intel/igb/e1000_82575.h >> index 6ad775b1a4c5..63ec253ac788 100644 >> --- a/drivers/net/ethernet/intel/igb/e1000_82575.h >> +++ b/drivers/net/ethernet/intel/igb/e1000_82575.h >> @@ -127,6 +127,7 @@ struct e1000_adv_tx_context_desc { >> }; >> >> #define E1000_ADVTXD_MACLEN_SHIFT 9 /* Adv ctxt desc mac len shift */ >> +#define E1000_ADVTXD_TUCMD_L4T_UDP 0x00000000 /* L4 Packet TYPE of UDP */ >> #define E1000_ADVTXD_TUCMD_IPV4 0x00000400 /* IP Packet Type: 1=IPv4 */ >> #define E1000_ADVTXD_TUCMD_L4T_TCP 0x00000800 /* L4 Packet TYPE of TCP */ >> #define E1000_ADVTXD_TUCMD_L4T_SCTP 0x00001000 /* L4 packet TYPE of SCTP */ >> diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c >> index 105b0624081a..4131bc8b079e 100644 >> --- a/drivers/net/ethernet/intel/igb/igb_main.c >> +++ b/drivers/net/ethernet/intel/igb/igb_main.c >> @@ -2516,6 +2516,7 @@ igb_features_check(struct sk_buff *skb, struct net_device *dev, >> if (unlikely(mac_hdr_len > IGB_MAX_MAC_HDR_LEN)) >> return features & ~(NETIF_F_HW_CSUM | >> NETIF_F_SCTP_CRC | >> + NETIF_F_GSO_UDP_L4 | >> NETIF_F_HW_VLAN_CTAG_TX | >> NETIF_F_TSO | >> NETIF_F_TSO6); >> @@ -2524,6 +2525,7 @@ igb_features_check(struct sk_buff *skb, struct net_device *dev, >> if (unlikely(network_hdr_len > IGB_MAX_NETWORK_HDR_LEN)) >> return features & ~(NETIF_F_HW_CSUM | >> NETIF_F_SCTP_CRC | >> + NETIF_F_GSO_UDP_L4 | >> NETIF_F_TSO | >> NETIF_F_TSO6); >> >> @@ -3120,7 +3122,7 @@ static int igb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) >> NETIF_F_HW_CSUM; >> >> if (hw->mac.type >= e1000_82576) >> - netdev->features |= NETIF_F_SCTP_CRC; >> + netdev->features |= NETIF_F_SCTP_CRC | NETIF_F_GSO_UDP_L4; >> >> if (hw->mac.type >= e1000_i350) >> netdev->features |= NETIF_F_HW_TC; >> @@ -5694,6 +5696,7 @@ static int igb_tso(struct igb_ring *tx_ring, >> } ip; >> union { >> struct tcphdr *tcp; >> + struct udphdr *udp; >> unsigned char *hdr; >> } l4; >> u32 paylen, l4_offset; >> @@ -5713,7 +5716,8 @@ static int igb_tso(struct igb_ring *tx_ring, >> l4.hdr = skb_checksum_start(skb); >> >> /* ADV DTYP TUCMD MKRLOC/ISCSIHEDLEN */ >> - type_tucmd = E1000_ADVTXD_TUCMD_L4T_TCP; >> + type_tucmd = (!(skb_shinfo(skb)->gso_type & SKB_GSO_UDP_L4)) ? >> + E1000_ADVTXD_TUCMD_L4T_TCP : E1000_ADVTXD_TUCMD_L4T_UDP; > > The logic here seems a bit convoluted. Instead of testing for > '!SKB_GSO_UDP_L4' why not just make L4T_UDP the first option and drop the > '!'? That will make the TCP offload the default case rather than the UDP > offload. > > The same applies to the other 2 patches. OK sure. I think I was trying to keep the TCP case first for some reason, but agree that I should probably just reverse the order. Will send a v3. Josh