From mboxrd@z Thu Jan 1 00:00:00 1970 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 203875A027A for ; Sat, 2 Dec 2023 05:35:15 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1701491714; 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=iEzkKPNhbzPiRc/ViMxjkd5iiQQ/EGv8Tkpq3fZBCk4=; b=bO4jbiuEkJMuyZ1Hhqlc7e93dmPqaHzJDpUZC8luHfWm8jvsnXLlAymirnOEv4xOwabYFR GlsjinQCVm7JQlu9zqDNlh7DcYWilzmGSppG4EVazuXbl26zb0inI921WgtssqMaq/5rQQ Sqz1aFd0StF6PKk6yalsJuHJAsedHbI= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-472-x1_GTk2zOEKCiaeBoW0huQ-1; Fri, 01 Dec 2023 23:35:10 -0500 X-MC-Unique: x1_GTk2zOEKCiaeBoW0huQ-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 50ACD185A780; Sat, 2 Dec 2023 04:35:10 +0000 (UTC) Received: from elisabeth (unknown [10.39.208.34]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7FE642026D4C; Sat, 2 Dec 2023 04:35:09 +0000 (UTC) Date: Sat, 2 Dec 2023 05:35:07 +0100 From: Stefano Brivio To: David Gibson Subject: Re: [PATCH v3 08/16] flow: Introduce 'sidx' type to represent one side of one flow Message-ID: <20231202053507.2886eeca@elisabeth> In-Reply-To: <20231130020222.4056647-9-david@gibson.dropbear.id.au> References: <20231130020222.4056647-1-david@gibson.dropbear.id.au> <20231130020222.4056647-9-david@gibson.dropbear.id.au> Organization: Red Hat MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Message-ID-Hash: CN6DHKS4BXUYJB6ACOXC34L4XILQ4TPX X-Message-ID-Hash: CN6DHKS4BXUYJB6ACOXC34L4XILQ4TPX 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 Thu, 30 Nov 2023 13:02:14 +1100 David Gibson wrote: > In a number of places, we use indices into the flow table to identify a > specific flow. We also have cases where we need to identify a particular > side of a particular flow, and we expect those to become more common as > we generalise the flow table to cover more things. > > To assist with that, introduces flow_sidx_t, an index type which identifies > a specific side of a specific flow in the table. > > Signed-off-by: David Gibson > --- > flow.h | 14 ++++++++++++++ > flow_table.h | 36 ++++++++++++++++++++++++++++++++++++ > 2 files changed, 50 insertions(+) > > diff --git a/flow.h b/flow.h > index c820a15..4f12831 100644 > --- a/flow.h > +++ b/flow.h > @@ -39,6 +39,20 @@ struct flow_common { > #define FLOW_TABLE_PRESSURE 30 /* % of FLOW_MAX */ > #define FLOW_FILE_PRESSURE 30 /* % of c->nofile */ > > +/** > + * struct flow_sidx - ID for one side of a specific flow > + * @side: Side referenced (0 or 1) > + * @flow: Index of flow referenced > + */ > +typedef struct flow_sidx { > + int side :1; > + unsigned flow :FLOW_INDEX_BITS; > +} flow_sidx_t; > +static_assert(sizeof(flow_sidx_t) <= sizeof(uint32_t), > + "flow_sidx_t must fit within 32 bits"); > + > +#define FLOW_SIDX_NONE ((flow_sidx_t){ .flow = FLOW_MAX }) > + > union flow; > > void flow_table_compact(struct ctx *c, union flow *hole); > diff --git a/flow_table.h b/flow_table.h > index 5e897bd..3c68d4a 100644 > --- a/flow_table.h > +++ b/flow_table.h > @@ -47,4 +47,40 @@ static inline unsigned flow_idx(const struct flow_common *f) > */ > #define FLOW(idx) (&flowtab[(idx)]) > > +/** flow_at_sidx - Flow entry for a given sidx > + * @sidx: Flow & side index > + * > + * Return: pointer to the corresponding flow entry, or NULL > + */ > +static inline union flow *flow_at_sidx(flow_sidx_t sidx) > +{ > + if (sidx.flow >= FLOW_MAX) > + return NULL; > + return FLOW(sidx.flow); > +} > + > +/** flow_sidx_t - Index of one side of a flow from common structure > + * @f: Common flow fields pointer > + * @side: Which side to refer to (0 or 1) > + * > + * Return: index of @f and @side in the flow table > + */ > +static inline flow_sidx_t flow_sidx(const struct flow_common *f, > + int side) > +{ > + ASSERT(side == !!side); This gives me a false cppcheck (2.10) positive: flow_table.h:71:2: style: The comparison 'side == !!side' is always true because 'side' and '!!side' represent the same value. [knownConditionTrueFalse] ASSERT(side == !!side); ^ I guess cppcheck commit 5d1fdf795829 ("Fix issue 7904: Handle double nots in isSameExpression (#1305)") should be extended to also skip checking double nots in equality comparisons: diff --git a/lib/astutils.cpp b/lib/astutils.cpp index 2c01884c9..8e88ec817 100644 --- a/lib/astutils.cpp +++ b/lib/astutils.cpp @@ -1424,10 +1424,10 @@ bool isSameExpression(bool cpp, bool macro, const Token *tok1, const Token *tok2 tok2 = tok2->astOperand2(); } // Skip double not - if (Token::simpleMatch(tok1, "!") && Token::simpleMatch(tok1->astOperand1(), "!") && !Token::simpleMatch(tok1->astParent(), "=")) { + if (Token::simpleMatch(tok1, "!") && Token::simpleMatch(tok1->astOperand1(), "!") && !Token::simpleMatch(tok1->astParent(), "=") && !Token::simpleMatch(tok1->astParent(), "==")) { return isSameExpression(cpp, macro, tok1->astOperand1()->astOperand1(), tok2, library, pure, followVar, errors); } - if (Token::simpleMatch(tok2, "!") && Token::simpleMatch(tok2->astOperand1(), "!") && !Token::simpleMatch(tok2->astParent(), "=")) { + if (Token::simpleMatch(tok2, "!") && Token::simpleMatch(tok2->astOperand1(), "!") && !Token::simpleMatch(tok2->astParent(), "=") && !Token::simpleMatch(tok2->astParent(), "==")) { return isSameExpression(cpp, macro, tok1, tok2->astOperand1()->astOperand1(), library, pure, followVar, errors); } const bool tok_str_eq = tok1->str() == tok2->str(); ...anyway, I would just add an inline suppression for the moment, unless you have better ideas. -- Stefano