From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by passt.top (Postfix) with ESMTPS id 12B9E5A026D for ; Thu, 14 Dec 2023 03:15:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202312; t=1702520145; bh=vPssnK26P5RAFtywGsDBReQmEI2h0AV2R28S3EXXxoY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XiLRUoR4tu0lpfackvnkqzaH8ksQEbpITtrvfYnIx9X+vy7G4M7E8SGMJjzTkylou mk/QokErBfigssvZm+45S5nNvE3GQD49GinjeD09h/89RE5y0Xjc/nixu5kCixhAht ba4gcC/MpP46121lKnfcCYSWysmedIMEDvp1TNxaPJ9NK1lIIQo4t2FGH3dBPn8YH0 TmHc0DW8wPXbFwhTPFZ+DfHt6OS2pAypyZc0MMlqFc0wC7VYR45xuyU5fksPSoqGGk jcSsXqFUUBvKEswcyYxwahyVVGCAg7fGEiBvAZP89SNjFHer9PJJcROQ3irnzCCZzb wmYGvKBZ+SqhA== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4SrGD11t6vz4x3G; Thu, 14 Dec 2023 13:15:45 +1100 (AEDT) From: David Gibson To: passt-dev@passt.top, Stefano Brivio Subject: [PATCH 7/8] epoll: Better handling of number of epoll types Date: Thu, 14 Dec 2023 13:15:40 +1100 Message-ID: <20231214021541.3925825-8-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231214021541.3925825-1-david@gibson.dropbear.id.au> References: <20231214021541.3925825-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: KHGHEWLUXZG56JP5YUESU7PO323UCDAR X-Message-ID-Hash: KHGHEWLUXZG56JP5YUESU7PO323UCDAR X-MailFrom: dgibson@gandalf.ozlabs.org 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: David Gibson 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: As we already did for flow types, use an "EPOLL_NUM_TYPES" isntead of EPOLL_TYPE_MAX, which is a little bit safer and clearer. Add a static assert on the size of the matching names array. Signed-off-by: David Gibson --- passt.c | 4 +++- passt.h | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/passt.c b/passt.c index 870064f..a37a2f4 100644 --- a/passt.c +++ b/passt.c @@ -59,7 +59,7 @@ char pkt_buf[PKT_BUF_BYTES] __attribute__ ((aligned(PAGE_SIZE))); -char *epoll_type_str[EPOLL_TYPE_MAX + 1] = { +char *epoll_type_str[] = { [EPOLL_TYPE_TCP] = "connected TCP socket", [EPOLL_TYPE_TCP_LISTEN] = "listening TCP socket", [EPOLL_TYPE_TCP_TIMER] = "TCP timer", @@ -71,6 +71,8 @@ char *epoll_type_str[EPOLL_TYPE_MAX + 1] = { [EPOLL_TYPE_TAP_PASST] = "connected qemu socket", [EPOLL_TYPE_TAP_LISTEN] = "listening qemu socket", }; +static_assert(ARRAY_SIZE(epoll_type_str) == EPOLL_NUM_TYPES, + "epoll_type_str[] doesn't match enum epoll_type"); /** * post_handler() - Run periodic and deferred tasks for L4 protocol handlers diff --git a/passt.h b/passt.h index 20528d5..188ad2c 100644 --- a/passt.h +++ b/passt.h @@ -70,7 +70,7 @@ enum epoll_type { /* socket listening for qemu socket connections */ EPOLL_TYPE_TAP_LISTEN, - EPOLL_TYPE_MAX = EPOLL_TYPE_TAP_LISTEN, + EPOLL_NUM_TYPES, }; /** @@ -115,7 +115,7 @@ extern char pkt_buf [PKT_BUF_BYTES]; extern char *epoll_type_str[]; #define EPOLL_TYPE_STR(n) \ - (((uint8_t)(n) <= EPOLL_TYPE_MAX && epoll_type_str[(n)]) ? \ + (((uint8_t)(n) < EPOLL_NUM_TYPES && epoll_type_str[(n)]) ? \ epoll_type_str[(n)] : "?") #include /* For MAXNS below */ -- 2.43.0