public inbox for passt-dev@passt.top
 help / color / mirror / code / Atom feed
From: David Gibson <david@gibson.dropbear.id.au>
To: Stefano Brivio <sbrivio@redhat.com>
Cc: Laurent Vivier <lvivier@redhat.com>, passt-dev@passt.top
Subject: Re: [PATCH v3 6/9] checksum: use csum_ip4_header() in udp.c and tcp.c
Date: Fri, 1 Mar 2024 10:10:52 +1100	[thread overview]
Message-ID: <ZeEO_CWwhYOKPty3@zatzit> (raw)
In-Reply-To: <20240229172406.6a8331f1@elisabeth>

[-- Attachment #1: Type: text/plain, Size: 2626 bytes --]

On Thu, Feb 29, 2024 at 05:24:06PM +0100, Stefano Brivio wrote:
> On Sat, 17 Feb 2024 16:07:22 +0100
> Laurent Vivier <lvivier@redhat.com> wrote:
> 
> > We can find the same function to compute the IPv4 header
> > checksum in tcp.c, udp.c and tap.c
> > 
> > Use the function defined for tap.c, csum_ip4_header(), but
> > with the code used in tcp.c and udp.c as it doesn't need a fully
> > initialiazed IPv4 header, only protocol, tot_len, saddr and daddr.
> > 
> > Signed-off-by: Laurent Vivier <lvivier@redhat.com>
> > ---
> > 
> > Notes:
> >     v3:
> >       - function parameters provide tot_len, saddr, daddr and protocol
> >        rather than an iphdr
> >     
> >     v2:
> >       - use csum_ip4_header() from checksum.c
> >       - use code from tcp.c and udp.c in csum_ip4_header()
> >       - use "const struct iphfr *", check is not updated by the
> >         function but by the caller.
> > 
> >  checksum.c | 17 +++++++++++++----
> >  checksum.h |  3 ++-
> >  tap.c      |  3 ++-
> >  tcp.c      | 24 +++---------------------
> >  udp.c      | 20 ++------------------
> >  5 files changed, 22 insertions(+), 45 deletions(-)
> > 
> > diff --git a/checksum.c b/checksum.c
> > index 74e3742bc6f6..511b296a9a80 100644
> > --- a/checksum.c
> > +++ b/checksum.c
> > @@ -57,6 +57,7 @@
> >  #include <linux/icmpv6.h>
> >  
> >  #include "util.h"
> > +#include "ip.h"
> >  #include "checksum.h"
> >  
> >  /* Checksums are optional for UDP over IPv4, so we usually just set
> > @@ -116,13 +117,21 @@ uint16_t csum_fold(uint32_t sum)
> >  uint16_t csum(const void *buf, size_t len, uint32_t init);
> >  
> >  /**
> > - * csum_ip4_header() - Calculate and set IPv4 header checksum
> > + * csum_ip4_header() - Calculate IPv4 header checksum
> >   * @ip4h:	IPv4 header
> >   */
> > -void csum_ip4_header(struct iphdr *ip4h)
> > +uint16_t csum_ip4_header(uint16_t tot_len, uint8_t protocol,
> > +			 uint32_t saddr, uint32_t daddr)
> >  {
> > -	ip4h->check = 0;
> > -	ip4h->check = csum(ip4h, (size_t)ip4h->ihl * 4, 0);
> > +	uint32_t sum = L2_BUF_IP4_PSUM(protocol);
> 
> Now that we use this macro, Coverity Scan realises that it's broken:
> 
> #define L2_BUF_IP4_PSUM(proto) ((uint32_t)htons_constant(0x4500) +     \
> 				(uint32_t)htons_constant(0xff00 | (proto)))
> 
> ...but proto is eight (lower) bits, so this actually ignores 'proto'.

Uh... how so?

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

  reply	other threads:[~2024-02-29 23:11 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-17 15:07 [PATCH v3 0/9] Add vhost-user support to passt (part 1) Laurent Vivier
2024-02-17 15:07 ` [PATCH v3 1/9] iov: add some functions to manage iovec Laurent Vivier
2024-02-19  2:45   ` David Gibson
2024-02-17 15:07 ` [PATCH v3 2/9] pcap: add pcap_iov() Laurent Vivier
2024-02-19  2:50   ` David Gibson
2024-02-17 15:07 ` [PATCH v3 3/9] checksum: align buffers Laurent Vivier
2024-02-17 15:07 ` [PATCH v3 4/9] checksum: add csum_iov() Laurent Vivier
2024-02-19  2:52   ` David Gibson
2024-02-17 15:07 ` [PATCH v3 5/9] util: move IP stuff from util.[ch] to ip.[ch] Laurent Vivier
2024-02-19  2:59   ` David Gibson
2024-02-17 15:07 ` [PATCH v3 6/9] checksum: use csum_ip4_header() in udp.c and tcp.c Laurent Vivier
2024-02-19  3:01   ` David Gibson
2024-02-29 16:24   ` Stefano Brivio
2024-02-29 23:10     ` David Gibson [this message]
2024-03-01  7:58       ` Stefano Brivio
2024-03-01 12:23         ` David Gibson
2024-03-04 17:04           ` Stefano Brivio
2024-02-17 15:07 ` [PATCH v3 7/9] checksum: introduce functions to compute the header part checksum for TCP/UDP Laurent Vivier
2024-02-19  3:08   ` David Gibson
2024-02-28 13:26     ` Laurent Vivier
2024-02-29  0:38       ` David Gibson
2024-02-29  7:05         ` Stefano Brivio
2024-02-29  8:49           ` David Gibson
2024-02-29  8:56             ` Stefano Brivio
2024-02-29 14:15               ` Stefano Brivio
2024-02-29 23:09                 ` David Gibson
2024-03-01  6:56                   ` Stefano Brivio
2024-03-04  1:54                     ` David Gibson
2024-03-04 11:00                       ` Stefano Brivio
2024-03-04 22:47                         ` Stefano Brivio
2024-03-06  5:09                           ` David Gibson
2024-03-08  0:08                             ` Stefano Brivio
2024-03-08  1:20                               ` David Gibson
2024-02-17 15:07 ` [PATCH v3 8/9] tap: make tap_update_mac() generic Laurent Vivier
2024-02-17 15:07 ` [PATCH v3 9/9] tcp: Introduce ipv4_fill_headers()/ipv6_fill_headers() Laurent Vivier
2024-02-19  3:14   ` David Gibson
2024-02-29 16:29   ` Stefano Brivio
2024-02-29 16:31 ` [PATCH v3 0/9] Add vhost-user support to passt (part 1) Stefano Brivio

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=ZeEO_CWwhYOKPty3@zatzit \
    --to=david@gibson.dropbear.id.au \
    --cc=lvivier@redhat.com \
    --cc=passt-dev@passt.top \
    --cc=sbrivio@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://passt.top/passt

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for IMAP folder(s).