From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx01.omp.ru (mx01.omp.ru [90.154.21.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5FD8AEDE; Mon, 30 Sep 2024 20:36:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=90.154.21.10 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727728617; cv=none; b=usj23RahJUywFox1BTnj1PMa8F1DZlkY4jz6p7VzvR99TBmkrq09HGQFKrqVJP31tkaeFfs9otM+cDuk9eg/9IsS6p4JOfJk0BXddbaEKi1KOVQoKQBbTjkadpURUJv1R/82IZL7vNab5d3XRhu6jOBGvPXy41xPrUwP0L3Tj34= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727728617; c=relaxed/simple; bh=iOG6QXejhSdRm8E1UagT4uqNj9fswWpzf8iYPzM+aPI=; h=Message-ID:Date:MIME-Version:Subject:To:CC:References:From: In-Reply-To:Content-Type; b=J88Jjr7uda7KGi5mZy1ZE9qdKrX8BXEYBwblmPQs64iqm2BoWL/9+KZ7afyT1fde7+JSgQ/vrIsZuQKmJxJs2paJIwAkvU1imDblct8l9Q/pz2Zs2coGf0woaPD0eM2SMbMI7Gw4Ev7PhXYz05XjwS/toTxhg3kWi916DUYnq+8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=omp.ru; spf=pass smtp.mailfrom=omp.ru; arc=none smtp.client-ip=90.154.21.10 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=omp.ru Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=omp.ru Received: from [192.168.2.100] (213.87.154.82) by msexch01.omp.ru (10.188.4.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.1258.12; Mon, 30 Sep 2024 23:36:43 +0300 Message-ID: Date: Mon, 30 Sep 2024 23:36:40 +0300 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [net-next PATCH 11/11] net: ravb: Add VLAN checksum support To: Paul Barker , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni CC: Paul Barker , Geert Uytterhoeven , =?UTF-8?Q?Niklas_S=C3=B6derlund?= , Biju Das , Claudiu Beznea , , , References: <20240930160845.8520-1-paul@pbarker.dev> <20240930160845.8520-12-paul@pbarker.dev> Content-Language: en-US From: Sergey Shtylyov Organization: Open Mobile Platform In-Reply-To: <20240930160845.8520-12-paul@pbarker.dev> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit X-ClientProxiedBy: msexch01.omp.ru (10.188.4.12) To msexch01.omp.ru (10.188.4.12) X-KSE-ServerInfo: msexch01.omp.ru, 9 X-KSE-AntiSpam-Interceptor-Info: scan successful X-KSE-AntiSpam-Version: 6.1.0, Database issued on: 09/30/2024 20:27:55 X-KSE-AntiSpam-Status: KAS_STATUS_NOT_DETECTED X-KSE-AntiSpam-Method: none X-KSE-AntiSpam-Rate: 19 X-KSE-AntiSpam-Info: Lua profiles 188103 [Sep 30 2024] X-KSE-AntiSpam-Info: Version: 6.1.0.4 X-KSE-AntiSpam-Info: Envelope from: s.shtylyov@omp.ru X-KSE-AntiSpam-Info: LuaCore: 35 0.3.35 d90443ea3cdf6e421a9ef5a0a400f1251229ba23 X-KSE-AntiSpam-Info: {rep_avail} X-KSE-AntiSpam-Info: {Tracking_from_domain_doesnt_match_to} X-KSE-AntiSpam-Info: {SMTP from is not routable} X-KSE-AntiSpam-Info: 127.0.0.199:7.1.2;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;omp.ru:7.1.1 X-KSE-AntiSpam-Info: FromAlignment: s X-KSE-AntiSpam-Info: ApMailHostAddress: 213.87.154.82 X-KSE-AntiSpam-Info: {DNS response errors} X-KSE-AntiSpam-Info: Rate: 19 X-KSE-AntiSpam-Info: Status: not_detected X-KSE-AntiSpam-Info: Method: none X-KSE-AntiSpam-Info: Auth:dmarc=temperror header.from=omp.ru;spf=temperror smtp.mailfrom=omp.ru;dkim=none X-KSE-Antiphishing-Info: Clean X-KSE-Antiphishing-ScanningType: Heuristic X-KSE-Antiphishing-Method: None X-KSE-Antiphishing-Bases: 09/30/2024 20:31:00 X-KSE-Antivirus-Interceptor-Info: scan successful X-KSE-Antivirus-Info: Clean, bases: 9/30/2024 3:37:00 PM X-KSE-Attachment-Filter-Triggered-Rules: Clean X-KSE-Attachment-Filter-Triggered-Filters: Clean X-KSE-BulkMessagesFiltering-Scan-Result: InTheLimit On 9/30/24 19:08, Paul Barker wrote: > From: Paul Barker > > The GbEth IP supports offloading checksum calculation for VLAN-tagged > packets, provided that the EtherType is 0x8100 and only one VLAN tag is > present. > > Signed-off-by: Paul Barker [...] > diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c > index 832132d44fb4..eb7499d42a9b 100644 > --- a/drivers/net/ethernet/renesas/ravb_main.c > +++ b/drivers/net/ethernet/renesas/ravb_main.c > @@ -2063,11 +2063,30 @@ static void ravb_tx_timeout_work(struct work_struct *work) > > static bool ravb_can_tx_csum_gbeth(struct sk_buff *skb) > { > - /* TODO: Need to add support for VLAN tag 802.1Q */ > - if (skb_vlan_tag_present(skb)) > + u16 net_protocol = ntohs(skb->protocol); > + > + /* GbEth IP can calculate the checksum if: > + * - there are zero or one VLAN headers with TPID=0x8100 > + * - the network protocol is IPv4 or IPv6 > + * - the transport protocol is TCP, UDP or ICMP > + * - the packet is not fragmented > + */ > + > + if (skb_vlan_tag_present(skb) && > + (skb->vlan_proto != ETH_P_8021Q || net_protocol == ETH_P_8021Q)) Not sure I understand this check... Maybe s/==/!=/? > return false; > > - switch (ntohs(skb->protocol)) { > + if (net_protocol == ETH_P_8021Q) { > + struct vlan_hdr vhdr, *vh; > + > + vh = skb_header_pointer(skb, ETH_HLEN, sizeof(vhdr), &vhdr); Hm, I thought the VLAN header starts at ETH_HLEN - 2, not at ETH_HLEN... [...] MBR, Sergey