From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: passt.top; dmarc=pass (p=quarantine 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=U1vj7eX1; 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 ESMTPS id 938975A0287 for ; Wed, 11 Jun 2025 14:52:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1749646349; 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; bh=1lKVXPLF04Gnx42ZLnvfbhqJESbXshVa765PuzEyW0M=; b=U1vj7eX1CIAkIG3SrTC3g4N98oGNWMU1IJP1sPrXAMLSn3+ARdM93T69cOpIYH07if7hD9 3nzTW65Fvl+NfDtNmS78ubBB4Bbe54z0fMsssW/f7hdaSJSlcUUjSgpiD5R6Gdkmk16mDM iSB2ZyXJOpjka8z1s9XAmPEXJ+xdGXE= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-202-UwG9ogW3NhmjFASlaJYxgw-1; Wed, 11 Jun 2025 08:52:22 -0400 X-MC-Unique: UwG9ogW3NhmjFASlaJYxgw-1 X-Mimecast-MFC-AGG-ID: UwG9ogW3NhmjFASlaJYxgw_1749646341 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-3a52cb5684dso3457632f8f.3 for ; Wed, 11 Jun 2025 05:52:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749646340; x=1750251140; h=content-transfer-encoding:mime-version:organization:references :in-reply-to:message-id:subject:cc:to:from:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=1lKVXPLF04Gnx42ZLnvfbhqJESbXshVa765PuzEyW0M=; b=IxNtq9X2eoJ726vYZywvSYKMq2iwZw78PPwGS3aBD9YMLmcuF35Eum7/FhYtM9bAAh YXfPZmqmO2W5xi9utHLI6LmqFV8TpJhxMIv4dq5JkevStk6ze0cItj/WvVbcmUyePsb8 YTXkJql0UbSfMfQ5kaLF8Ms3EGPZVAUJPiSWNtLAs7C0A36DS3DXd2lNhHoXN2EmfjZB pgUtJ84WKS2bjpl9sHRcXGrDiIsa8DRdDFQDlRo40t+v64ImmNTUmIASQLSw0IuJCNDW nL2yVkY4FcLFTSG+u8AKMD2l7eKarFkYLmyHL0H+bCtqVwPgJsHvacMtwMukG8aYCB4l HGBA== X-Gm-Message-State: AOJu0Yw9QeqNeWOQckS9x8XRiVFLoDT34EBRMaslasARzmqY3CKsz57P F+YjXZjsUk7xIDLYHw+1vkYTW4e1O0rHZcW4o8Cxc2aDxQPhX7U38w6Aollp8yKY/nc9lW9t29A ygYQl32gAZ2+MnqOgiPMhn9rFMCXD4MbiJZOFAyWzykSJLJqNKAQNPx9gh26+NlojWEgDb3QBPV rsby3e4sQO0EupGYB5Gxyhd3H7FG0nZ4G6LL3B X-Gm-Gg: ASbGncvpIh6MHiL7KFchcLo8r1D7QPxbwfL+augyIwj6R6ayLmmn6JpUzq+kIDq3VDD ydRuxAwIzINjgo4tAlkbyR8XfJqo+BTNH59J+2y5r8eBNXtsTfcUKbpN9JJ1/PXSlvcvOq+MXq8 S43L8hRgBYUIt+hepj0YmHfKrJkEUxWQ+NCIFP0AKJ0OARNCPQiuXI+o1CbLm+TDwb9WzmLqzZE +1ODp3rmL5Py4ehr28sdY0wwlYu/EJsaeH7l9gfErz84vC1GHkmazW5vE4lrrIK0EzTlSayJPSz 3pYH0Vf4l750u71UywwCvcp8G8t9ksNvRTakq2Bz/ddiAAgcT6Y= X-Received: by 2002:a05:6000:2002:b0:3a4:e65d:5d8c with SMTP id ffacd0b85a97d-3a558a31109mr2646037f8f.40.1749646340487; Wed, 11 Jun 2025 05:52:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFFLs/NFGDvRf4V0RLl2q7K98TlTbi3q08B30BPE1Q7ATieCerYCCQJcW4bJrW3kMYGEcGt3w== X-Received: by 2002:a05:6000:2002:b0:3a4:e65d:5d8c with SMTP id ffacd0b85a97d-3a558a31109mr2646008f8f.40.1749646339988; Wed, 11 Jun 2025 05:52:19 -0700 (PDT) Received: from maya.myfinge.rs (ifcgrfdd.trafficplex.cloud. [176.103.220.4]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a5323ae18esm15648366f8f.33.2025.06.11.05.52.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Jun 2025 05:52:19 -0700 (PDT) Date: Wed, 11 Jun 2025 14:52:17 +0200 From: Stefano Brivio To: Laurent Vivier Subject: Re: [PATCH v6 03/30] iov: Update IOV_REMOVE_HEADER() and IOV_PEEK_HEADER() Message-ID: <20250611145217.104e8912@elisabeth> In-Reply-To: <20250604130834.3868010-4-lvivier@redhat.com> References: <20250604130834.3868010-1-lvivier@redhat.com> <20250604130834.3868010-4-lvivier@redhat.com> Organization: Red Hat X-Mailer: Claws Mail 4.2.0 (GTK 3.24.49; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: t4K6x2rRHjOOXuYnNZ-2gPv2lcv-A0XBcnX9FoWtnaU_1749646341 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Message-ID-Hash: JQ7VYPH322Y7WKGN6YL6XGYNB6YOH4BH X-Message-ID-Hash: JQ7VYPH322Y7WKGN6YL6XGYNB6YOH4BH X-MailFrom: sbrivio@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 Wed, 4 Jun 2025 15:08:07 +0200 Laurent Vivier wrote: > Provide a temporary variable of the wanted type to store > the header if the memory in the iovec array is not contiguous. > > Signed-off-by: Laurent Vivier > --- > iov.c | 53 ++++++++++++++++++++++++++++++++++++++++++++--------- > iov.h | 55 +++++++++++++++++++++++++++++++++++++++++-------------- > tcp_buf.c | 2 +- > 3 files changed, 86 insertions(+), 24 deletions(-) > > diff --git a/iov.c b/iov.c > index 3b89f8126ee7..541ca8aa9119 100644 > --- a/iov.c > +++ b/iov.c > @@ -109,7 +109,7 @@ size_t iov_from_buf(const struct iovec *iov, size_t iov_cnt, > * > * Returns: The number of bytes successfully copied. > */ > -/* cppcheck-suppress unusedFunction */ > +/* cppcheck-suppress [staticFunction] */ > size_t iov_to_buf(const struct iovec *iov, size_t iov_cnt, > size_t offset, void *buf, size_t bytes) > { > @@ -127,6 +127,7 @@ size_t iov_to_buf(const struct iovec *iov, size_t iov_cnt, > /* copying data */ > for (copied = 0; copied < bytes && i < iov_cnt; i++) { > size_t len = MIN(iov[i].iov_len - offset, bytes - copied); > + /* NOLINTNEXTLINE(clang-analyzer-core.NonNullParamChecker) */ > memcpy((char *)buf + copied, (char *)iov[i].iov_base + offset, > len); > copied += len; > @@ -208,7 +209,7 @@ bool iov_tail_drop(struct iov_tail *tail, size_t len) > } > > /** > - * iov_peek_header_() - Get pointer to a header from an IOV tail > + * iov_check_header() - Check if a header can be accessed > * @tail: IOV tail to get header from > * @len: Length of header to get, in bytes > * @align: Required alignment of header, in bytes > @@ -219,8 +220,7 @@ bool iov_tail_drop(struct iov_tail *tail, size_t len) > * overruns the IO vector, is not contiguous or doesn't have the > * requested alignment. > */ > -/* cppcheck-suppress [staticFunction,unmatchedSuppression] */ > -void *iov_peek_header_(struct iov_tail *tail, size_t len, size_t align) > +static void *iov_check_header(struct iov_tail *tail, size_t len, size_t align) > { > char *p; > > @@ -240,27 +240,62 @@ void *iov_peek_header_(struct iov_tail *tail, size_t len, size_t align) > return p; > } > > +/** > + * iov_peek_header_() - Get pointer to a header from an IOV tail > + * @tail: IOV tail to get header from > + * @v: Temporary memory to use if the memory in @tail > + * is discontinuous > + * @len: Length of header to get, in bytes > + * @align: Required alignment of header, in bytes > + * > + * @tail may be pruned, but will represent the same bytes as before. > + * > + * Returns: Pointer to the first @len logical bytes of the tail, or to Nit: Return: pointer to ... > + * a copy if that overruns the IO vector, is not contiguous or > + * doesn't have the requested alignment. NULL if that overruns the > + * IO vector. > + */ > +/* cppcheck-suppress [staticFunction,unmatchedSuppression] */ > +void *iov_peek_header_(struct iov_tail *tail, void *v, size_t len, size_t align) > +{ > + char *p = iov_check_header(tail, len, align); > + size_t l; > + > + if (p) > + return p; > + > + l = iov_to_buf(tail->iov, tail->cnt, tail->off, v, len); > + if (l != len) > + return NULL; > + > + return v; > +} > + > /** > * iov_remove_header_() - Remove a header from an IOV tail > * @tail: IOV tail to remove header from (modified) > + * @v: Temporary memory to use if the memory in @tail > + * is discontinuous > * @len: Length of header to remove, in bytes > * @align: Required alignment of header, in bytes > * > * On success, @tail is updated so that it longer includes the bytes of the > * returned header. > * > - * Returns: Pointer to the first @len logical bytes of the tail, NULL if that > - * overruns the IO vector, is not contiguous or doesn't have the > - * requested alignment. > + * Returns: Pointer to the first @len logical bytes of the tail, or to > + * a copy if that overruns the IO vector, is not contiguous or > + * doesn't have the requested alignment. NULL if that overruns the > + * IO vector. > */ > -void *iov_remove_header_(struct iov_tail *tail, size_t len, size_t align) > +void *iov_remove_header_(struct iov_tail *tail, void *v, size_t len, size_t align) > { > - char *p = iov_peek_header_(tail, len, align); > + char *p = iov_peek_header_(tail, v, len, align); > > if (!p) > return NULL; > > tail->off = tail->off + len; > + > return p; > } > > diff --git a/iov.h b/iov.h > index 11a8567aa183..7d5bce2f841c 100644 > --- a/iov.h > +++ b/iov.h > @@ -70,41 +70,68 @@ struct iov_tail { > #define IOV_TAIL(iov_, cnt_, off_) \ > (struct iov_tail){ .iov = (iov_), .cnt = (cnt_), .off = (off_) } > > +/** > + * IOV_TAIL_FROM_BUF() - Create a new IOV tail from a buffer > + * @buf_: Buffer address to use in the iovec > + * @len_: Buffer size > + * @off_: Byte offset in the buffer where the tail begins > + */ > +#define IOV_TAIL_FROM_BUF(buf_, len_, off_) \ > + IOV_TAIL((&(const struct iovec){ .iov_base = (buf_), \ > + .iov_len = (len_) }), \ > + 1, \ > + (off_)) > + > bool iov_tail_prune(struct iov_tail *tail); > size_t iov_tail_size(struct iov_tail *tail); > bool iov_tail_drop(struct iov_tail *tail, size_t len); > -void *iov_peek_header_(struct iov_tail *tail, size_t len, size_t align); > -void *iov_remove_header_(struct iov_tail *tail, size_t len, size_t align); > +void *iov_peek_header_(struct iov_tail *tail, void *v, size_t len, size_t align); > +void *iov_remove_header_(struct iov_tail *tail, void *v, size_t len, size_t align); > ssize_t iov_tail_clone(struct iovec *dst_iov, size_t dst_iov_cnt, > struct iov_tail *tail); > > /** > * IOV_PEEK_HEADER() - Get typed pointer to a header from an IOV tail > * @tail_: IOV tail to get header from > - * @type_: Data type of the header > + * @var_: Temporary buffer of the type of the header to use if > + * the memory in the iovec array is not contiguous. > * > * @tail_ may be pruned, but will represent the same bytes as before. > * > - * Returns: Pointer of type (@type_ *) located at the start of @tail_, NULL if > - * we can't get a contiguous and aligned pointer. > + * Returns: Pointer of type (@type_ *) located at the start of @tail_ > + * or to @var_ if iovec memory is not contiguous, NULL if > + * that overruns the iovec. > */ > -#define IOV_PEEK_HEADER(tail_, type_) \ > - ((type_ *)(iov_peek_header_((tail_), \ > - sizeof(type_), __alignof__(type_)))) > + > +#define IOV_PEEK_HEADER(tail_, var_) \ > + ((__typeof__(var_) *)(iov_peek_header_((tail_), &(var_), \ > + sizeof(var_), \ > + __alignof__(var_)))) > > /** > * IOV_REMOVE_HEADER() - Remove and return typed header from an IOV tail > * @tail_: IOV tail to remove header from (modified) > - * @type_: Data type of the header to remove > + * @var_: Temporary buffer of the type of the header to use if > + * the memory in the iovec array is not contiguous. > * > * On success, @tail_ is updated so that it longer includes the bytes of the > * returned header. > * > - * Returns: Pointer of type (@type_ *) located at the old start of @tail_, NULL > - * if we can't get a contiguous and aligned pointer. > + * Returns: Pointer of type (@type_ *) located at the start of @tail_ > + * or to @var_ if iovec memory is not contiguous, NULL if > + * that overruns the iovec. > + */ > + > +#define IOV_REMOVE_HEADER(tail_, var_) \ > + ((__typeof__(var_) *)(iov_remove_header_((tail_), &(var_), \ > + sizeof(var_), __alignof__(var_)))) > + > +/** IOV_DROP_HEADER() - Remove a typed header from an IOV tail > + * @tail_: IOV tail to remove header from (modified) > + * @type_: Data type of the header to remove > + * > + * Returns: true if the tail still contains any bytes, otherwise false > */ > -#define IOV_REMOVE_HEADER(tail_, type_) \ > - ((type_ *)(iov_remove_header_((tail_), \ > - sizeof(type_), __alignof__(type_)))) > +#define IOV_DROP_HEADER(tail_, type_) iov_tail_drop((tail_), sizeof(type_)) > > #endif /* IOVEC_H */ > diff --git a/tcp_buf.c b/tcp_buf.c > index 05305636b503..ac6d73130f55 100644 > --- a/tcp_buf.c > +++ b/tcp_buf.c > @@ -160,7 +160,7 @@ static void tcp_l2_buf_fill_headers(const struct tcp_tap_conn *conn, > uint32_t seq, bool no_tcp_csum) > { > struct iov_tail tail = IOV_TAIL(&iov[TCP_IOV_PAYLOAD], 1, 0); > - struct tcphdr *th = IOV_REMOVE_HEADER(&tail, struct tcphdr); > + struct tcphdr th_storage, *th = IOV_REMOVE_HEADER(&tail, th_storage); > struct tap_hdr *taph = iov[TCP_IOV_TAP].iov_base; > const struct flowside *tapside = TAPFLOW(conn); > const struct in_addr *a4 = inany_v4(&tapside->oaddr); -- Stefano