From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: passt.top; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: passt.top; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=bw4KvPmU; dkim-atps=neutral Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by passt.top (Postfix) with ESMTP id 3F6FD5A004E for ; Wed, 02 Oct 2024 09:39:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1727854768; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=qTOu2wrDU3Svg5VJUQZF6q/BEcNK401CuJB9nL2sJWs=; b=bw4KvPmUyayqDCNWyrjkeq0QhX0CTqwCFSmFIouegiDLU9F2i93nU7OmX/3YduW7QDZBnn WFQiIEuqI+iPeGAHk9UKUN4Xor5PaYzx3l/XGB65UGvkqxuUZys0pFAjl4kmpiUtL946Pj a1Z/qbDqjvOMkXKprh20j5xwmEUUZdc= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-378-r7sLSLjeNkyqePAWts2ocw-1; Wed, 02 Oct 2024 03:39:26 -0400 X-MC-Unique: r7sLSLjeNkyqePAWts2ocw-1 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-42cb9e14ab6so48865685e9.3 for ; Wed, 02 Oct 2024 00:39:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727854765; x=1728459565; h=content-transfer-encoding:in-reply-to:autocrypt:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=qTOu2wrDU3Svg5VJUQZF6q/BEcNK401CuJB9nL2sJWs=; b=p9zjbcZsc7DnO9U2cV8FoWa0HH6/2m0NJ4pyn3tybt7SBUpN38vMjanW3ukwxC5fcf OkybjuhsntpPOr/QssaIxukAVFz27eDW2n4D0Zsv+qpGR3CAueJ0GsNE3dKO78a3MpNb iwtQbx087lQO24eA0ANP8ggp6+D5fl5RRlOdOi2CcMYR4t2d46d/9BHDPFu+w0hU+FqT 8ObjAf5UyCL8mNJqITf9AykMuxmGfOdgpYew8OFvZ3fjz5E9l4Jq6OasOO0mYMB7SZRx FwkgfsR1Fj0i38OasUUeCGU1fKdOSRhZ9aRXlUA3SOfPQ50YpLlZ6LgPistpNX+hZ6vI xbgA== X-Gm-Message-State: AOJu0YyORIq4ei9QDec8roqsxN7dM6+IEm2mpz9HX7P3jxvQC3lfqRPV TgqNDYHbddCgC5UbWxDGPXBvcc0nzSu5DuA8xkUrMarXRQyA2P3ht1n1cWkFaJ24tQVfntxJv3B ANyXRTHio9QzTJqbhAUnuqhdjAN9QCwFA8y0xZ6mCb2qA6WicqjvQjPPkgQ== X-Received: by 2002:a05:600c:5254:b0:42c:b8cc:205a with SMTP id 5b1f17b1804b1-42f778ffbd9mr15423085e9.32.1727854765095; Wed, 02 Oct 2024 00:39:25 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGUHQeZFXnYGL8KraVzUppssIb6GEr3R9j3vSr8Mky28g2yKUm2jrvpqiLTNO6/mMWVv2hUFQ== X-Received: by 2002:a05:600c:5254:b0:42c:b8cc:205a with SMTP id 5b1f17b1804b1-42f778ffbd9mr15422945e9.32.1727854764641; Wed, 02 Oct 2024 00:39:24 -0700 (PDT) Received: from ?IPV6:2a01:e0a:e10:ef90:4c84:58cb:a1ef:8b78? ([2a01:e0a:e10:ef90:4c84:58cb:a1ef:8b78]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37cd572fa48sm13293530f8f.66.2024.10.02.00.39.24 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 02 Oct 2024 00:39:24 -0700 (PDT) Message-ID: <4efad680-ccf3-45a8-8929-cc5ae2be4760@redhat.com> Date: Wed, 2 Oct 2024 09:39:23 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v5 4/5] tcp: Update TCP checksum using an iovec array To: Stefano Brivio References: <20240927135349.675850-1-lvivier@redhat.com> <20240927135349.675850-5-lvivier@redhat.com> <20241001092928.33755f2b@elisabeth> <20241001202216.5c3ee274@elisabeth> From: Laurent Vivier Autocrypt: addr=lvivier@redhat.com; keydata= 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 In-Reply-To: <20241001202216.5c3ee274@elisabeth> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Message-ID-Hash: 4PMNO6B3NURQB65EJ22KH75VAXKZ6C7Y X-Message-ID-Hash: 4PMNO6B3NURQB65EJ22KH75VAXKZ6C7Y X-MailFrom: lvivier@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: passt-dev@passt.top X-Mailman-Version: 3.3.8 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: On 01/10/2024 20:22, Stefano Brivio wrote: > On Tue, 1 Oct 2024 09:29:28 +0200 > Stefano Brivio wrote: > >> On Fri, 27 Sep 2024 15:53:48 +0200 >> Laurent Vivier wrote: >> >>> [...] >>> >>> +void tcp_update_check_tcp4(const struct iphdr *iph, >>> + const struct iovec *iov, int iov_cnt, >>> + size_t l4offset) >>> { >>> uint16_t l4len = ntohs(iph->tot_len) - sizeof(struct iphdr); >>> struct in_addr saddr = { .s_addr = iph->saddr }; >>> struct in_addr daddr = { .s_addr = iph->daddr }; >>> - uint32_t sum = proto_ipv4_header_psum(l4len, IPPROTO_TCP, saddr, daddr); >>> + size_t check_ofs; >>> + __sum16 *check; >>> + int check_idx; >>> + uint32_t sum; >>> + uintptr_t ptr; >>> + >>> + sum = proto_ipv4_header_psum(l4len, IPPROTO_TCP, saddr, daddr); >>> + >>> + check_idx = iov_skip_bytes(iov, iov_cnt, >>> + l4offset + offsetof(struct tcphdr, check), >>> + &check_ofs); >>> + >>> + if (check_idx >= iov_cnt) { >>> + err("TCP4 buffer is too small, iov size %zd, check offset %zd", >>> + iov_size(iov, iov_cnt), >>> + l4offset + offsetof(struct tcphdr, check)); >>> + return; >>> + } >>> >>> - bp->th.check = 0; >>> - bp->th.check = csum(bp, l4len, sum); >>> + if (check_ofs + sizeof(*check) > iov[check_idx].iov_len) { >>> + err("TCP4 checksum field memory is not contiguous " >>> + "check_ofs %zd check_idx %d iov_len %zd", >>> + check_ofs, check_idx, iov[check_idx].iov_len); >>> + return; >>> + } >>> + >>> + ptr = (uintptr_t)((char *)iov[check_idx].iov_base + check_ofs); >>> + if (ptr & (__alignof__(*check) - 1)) { >>> + err("TCP4 checksum field is not correctly aligned in memory"); >>> + return; >>> + } >>> + >>> + check = (__sum16 *)ptr; >> >> clang-tidy (14.0.6) says: >> >> /home/sbrivio/passt/tcp.c:803:10: error: integer to pointer cast pessimizes optimization opportunities [performance-no-int-to-ptr,-warnings-as-errors] >> check = (__sum16 *)ptr; >> ^ >> /home/sbrivio/passt/tcp.c:854:10: error: integer to pointer cast pessimizes optimization opportunities [performance-no-int-to-ptr,-warnings-as-errors] >> check = (__sum16 *)ptr; >> ^ >> >> ...I'm still trying to figure out what that actually means. If it's >> trivial I can fix that up on merge. > > Something like this? It's ok for me. Do you want I resend a version with it or can you update the patch on the merge? Thanks, Laurent > > -- > diff --git a/tcp.c b/tcp.c > index ffd82e1..2b8edda 100644 > --- a/tcp.c > +++ b/tcp.c > @@ -772,7 +772,7 @@ void tcp_update_check_tcp4(const struct iphdr *iph, > __sum16 *check; > int check_idx; > uint32_t sum; > - uintptr_t ptr; > + char *ptr; > > sum = proto_ipv4_header_psum(l4len, IPPROTO_TCP, saddr, daddr); > > @@ -794,8 +794,8 @@ void tcp_update_check_tcp4(const struct iphdr *iph, > return; > } > > - ptr = (uintptr_t)((char *)iov[check_idx].iov_base + check_ofs); > - if (ptr & (__alignof__(*check) - 1)) { > + ptr = (char *)iov[check_idx].iov_base + check_ofs; > + if ((uintptr_t)ptr & (__alignof__(*check) - 1)) { > err("TCP4 checksum field is not correctly aligned in memory"); > return; > } > @@ -822,7 +822,7 @@ void tcp_update_check_tcp6(const struct ipv6hdr *ip6h, > __sum16 *check; > int check_idx; > uint32_t sum; > - uintptr_t ptr; > + char *ptr; > > sum = proto_ipv6_header_psum(l4len, IPPROTO_TCP, &ip6h->saddr, > &ip6h->daddr); > @@ -845,8 +845,8 @@ void tcp_update_check_tcp6(const struct ipv6hdr *ip6h, > return; > } > > - ptr = (uintptr_t)((char *)iov[check_idx].iov_base + check_ofs); > - if (ptr & (__alignof__(*check) - 1)) { > + ptr = (char *)iov[check_idx].iov_base + check_ofs; > + if ((uintptr_t)ptr & (__alignof__(*check) - 1)) { > err("TCP6 checksum field is not correctly aligned in memory"); > return; > } >