From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4A8D8C433F5 for ; Mon, 4 Apr 2022 12:06:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237379AbiDDMIe (ORCPT ); Mon, 4 Apr 2022 08:08:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38940 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236964AbiDDMI0 (ORCPT ); Mon, 4 Apr 2022 08:08:26 -0400 Received: from kadath.azazel.net (unknown [IPv6:2001:8b0:135f:bcd1:e0cb:4eff:fedf:e608]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 16BFE3DDC3 for ; Mon, 4 Apr 2022 05:06:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=azazel.net; s=20190108; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=owonsmGp7Udrvmblrix9dbLtwwiDelEkhhGyOdNakIo=; b=Sgf1QY+qxJtWjt1+6MqidNFdS8 0x/a17wtQoVM9vOh+e8GqSdqe3VSM24pARGuMicYJ6Vg4n5SmVJb2k14wy3nmmSKKFupCRW13drMs tOHEWPItp1IMYag1FTbXg771uvl9u2nhgYevOfQS/VUcMDoc/Bxxe4HTTxTKu6mZO5EUAfz29xNVV 6xa/igi9bTCeGw5JcHrqmnM8eTCFE8PYr4k/Oo4HYl8jrIRQ1ORH/loFkpkHWgG/Mm+MJ2j7hFYWf 80Tx6dizjIjnV5M9R2eQP2gQdWUKjN2ASJgPmcQUlYdcJNHM3s5vYTBLF9YMIbufOlqYkbMPGWQhf +OCBNUew==; Received: from ulthar.dreamlands.azazel.net ([2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae]) by kadath.azazel.net with esmtp (Exim 4.94.2) (envelope-from ) id 1nbLTY-007FNA-DK for netfilter-devel@vger.kernel.org; Mon, 04 Apr 2022 13:06:28 +0100 From: Jeremy Sowden To: Netfilter Devel Subject: [libnftnl PATCH v2 8/9] tests: bitwise: refactor shift tests Date: Mon, 4 Apr 2022 13:06:22 +0100 Message-Id: <20220404120623.188439-9-jeremy@azazel.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220404120623.188439-1-jeremy@azazel.net> References: <20220404120623.188439-1-jeremy@azazel.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae X-SA-Exim-Mail-From: jeremy@azazel.net X-SA-Exim-Scanned: No (on kadath.azazel.net); SAEximRunCond expanded to false Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Deduplicate shift tests: instead of having separate implementations for left- and right-shifts, have one and pass the operation to it. Signed-off-by: Jeremy Sowden --- tests/nft-expr_bitwise-test.c | 163 ++++++++++------------------------ 1 file changed, 47 insertions(+), 116 deletions(-) diff --git a/tests/nft-expr_bitwise-test.c b/tests/nft-expr_bitwise-test.c index 96298a4a97d2..5e7e277a5081 100644 --- a/tests/nft-expr_bitwise-test.c +++ b/tests/nft-expr_bitwise-test.c @@ -58,58 +58,6 @@ static void cmp_nftnl_expr_mask_xor(struct nftnl_expr *rule_a, print_err("mask & xor", "Size of BITWISE_XOR mismatches"); } -static void cmp_nftnl_expr_lshift(struct nftnl_expr *rule_a, - struct nftnl_expr *rule_b) -{ - uint32_t data_a, data_b; - - if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_BITWISE_DREG) != - nftnl_expr_get_u32(rule_b, NFTNL_EXPR_BITWISE_DREG)) - print_err("lshift", "Expr BITWISE_DREG mismatches"); - if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_BITWISE_SREG) != - nftnl_expr_get_u32(rule_b, NFTNL_EXPR_BITWISE_SREG)) - print_err("lshift", "Expr BITWISE_SREG mismatches"); - if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_BITWISE_OP) != - nftnl_expr_get_u32(rule_b, NFTNL_EXPR_BITWISE_OP)) - print_err("lshift", "Expr BITWISE_OP mismatches"); - if (nftnl_expr_get_u16(rule_a, NFTNL_EXPR_BITWISE_LEN) != - nftnl_expr_get_u16(rule_b, NFTNL_EXPR_BITWISE_LEN)) - print_err("lshift", "Expr BITWISE_LEN mismatches"); - if (nftnl_expr_get_u16(rule_a, NFTNL_EXPR_BITWISE_NBITS) != - nftnl_expr_get_u16(rule_b, NFTNL_EXPR_BITWISE_NBITS)) - print_err("lshift", "Expr BITWISE_NBITS mismatches"); - nftnl_expr_get(rule_a, NFTNL_EXPR_BITWISE_DATA, &data_a); - nftnl_expr_get(rule_b, NFTNL_EXPR_BITWISE_DATA, &data_b); - if (data_a != data_b) - print_err("lshift", "Expr BITWISE_DATA mismatches"); -} - -static void cmp_nftnl_expr_rshift(struct nftnl_expr *rule_a, - struct nftnl_expr *rule_b) -{ - uint32_t data_a, data_b; - - if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_BITWISE_DREG) != - nftnl_expr_get_u32(rule_b, NFTNL_EXPR_BITWISE_DREG)) - print_err("rshift", "Expr BITWISE_DREG mismatches"); - if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_BITWISE_SREG) != - nftnl_expr_get_u32(rule_b, NFTNL_EXPR_BITWISE_SREG)) - print_err("rshift", "Expr BITWISE_SREG mismatches"); - if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_BITWISE_OP) != - nftnl_expr_get_u32(rule_b, NFTNL_EXPR_BITWISE_OP)) - print_err("rshift", "Expr BITWISE_OP mismatches"); - if (nftnl_expr_get_u16(rule_a, NFTNL_EXPR_BITWISE_LEN) != - nftnl_expr_get_u16(rule_b, NFTNL_EXPR_BITWISE_LEN)) - print_err("rshift", "Expr BITWISE_LEN mismatches"); - if (nftnl_expr_get_u16(rule_a, NFTNL_EXPR_BITWISE_NBITS) != - nftnl_expr_get_u16(rule_b, NFTNL_EXPR_BITWISE_NBITS)) - print_err("rshift", "Expr BITWISE_NBITS mismatches"); - nftnl_expr_get(rule_a, NFTNL_EXPR_BITWISE_DATA, &data_a); - nftnl_expr_get(rule_b, NFTNL_EXPR_BITWISE_DATA, &data_b); - if (data_a != data_b) - print_err("rshift", "Expr BITWISE_DATA mismatches"); -} - static void test_mask_xor(void) { struct nftnl_rule *a, *b = NULL; @@ -168,26 +116,54 @@ static void test_mask_xor(void) nftnl_rule_free(b); } -static void test_lshift(void) +static void cmp_nftnl_expr_shift(const char *opname, + const struct nftnl_expr *rule_a, + const struct nftnl_expr *rule_b) { - struct nftnl_rule *a, *b = NULL; - struct nftnl_expr *ex = NULL; + uint32_t data_a, data_b; + + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_BITWISE_DREG) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_BITWISE_DREG)) + print_err(opname, "Expr BITWISE_DREG mismatches"); + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_BITWISE_SREG) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_BITWISE_SREG)) + print_err(opname, "Expr BITWISE_SREG mismatches"); + if (nftnl_expr_get_u32(rule_a, NFTNL_EXPR_BITWISE_OP) != + nftnl_expr_get_u32(rule_b, NFTNL_EXPR_BITWISE_OP)) + print_err(opname, "Expr BITWISE_OP mismatches"); + if (nftnl_expr_get_u16(rule_a, NFTNL_EXPR_BITWISE_LEN) != + nftnl_expr_get_u16(rule_b, NFTNL_EXPR_BITWISE_LEN)) + print_err(opname, "Expr BITWISE_LEN mismatches"); + if (nftnl_expr_get_u16(rule_a, NFTNL_EXPR_BITWISE_NBITS) != + nftnl_expr_get_u16(rule_b, NFTNL_EXPR_BITWISE_NBITS)) + print_err(opname, "Expr BITWISE_NBITS mismatches"); + nftnl_expr_get(rule_a, NFTNL_EXPR_BITWISE_DATA, &data_a); + nftnl_expr_get(rule_b, NFTNL_EXPR_BITWISE_DATA, &data_b); + if (data_a != data_b) + print_err(opname, "Expr BITWISE_DATA mismatches"); +} + +static void test_shift(enum nft_bitwise_ops op) +{ + struct nftnl_rule *a, *b; + struct nftnl_expr *ex; struct nlmsghdr *nlh; char buf[4096]; - struct nftnl_expr_iter *iter_a, *iter_b = NULL; - struct nftnl_expr *rule_a, *rule_b = NULL; + struct nftnl_expr_iter *iter_a, *iter_b; + struct nftnl_expr *rule_a, *rule_b; + const char *opname = op == NFT_BITWISE_LSHIFT ? "lshift" : "rshift"; a = nftnl_rule_alloc(); b = nftnl_rule_alloc(); if (a == NULL || b == NULL) - print_err("lshift", "OOM"); + print_err(opname, "OOM"); ex = nftnl_expr_alloc("bitwise"); if (ex == NULL) - print_err("lshift", "OOM"); + print_err(opname, "OOM"); nftnl_expr_set_u32(ex, NFTNL_EXPR_BITWISE_SREG, 0x12345678); nftnl_expr_set_u32(ex, NFTNL_EXPR_BITWISE_DREG, 0x78123456); - nftnl_expr_set_u32(ex, NFTNL_EXPR_BITWISE_OP, NFT_BITWISE_LSHIFT); + nftnl_expr_set_u32(ex, NFTNL_EXPR_BITWISE_OP, op); nftnl_expr_set_u32(ex, NFTNL_EXPR_BITWISE_LEN, 0x56781234); nftnl_expr_set_u32(ex, NFTNL_EXPR_BITWISE_NBITS, 0x11223344); nftnl_expr_set_u32(ex, NFTNL_EXPR_BITWISE_DATA, 13); @@ -198,84 +174,39 @@ static void test_lshift(void) nftnl_rule_nlmsg_build_payload(nlh, a); if (nftnl_rule_nlmsg_parse(nlh, b) < 0) - print_err("lshift", "parsing problems"); + print_err(opname, "parsing problems"); iter_a = nftnl_expr_iter_create(a); iter_b = nftnl_expr_iter_create(b); if (iter_a == NULL || iter_b == NULL) - print_err("lshift", "OOM"); + print_err(opname, "OOM"); rule_a = nftnl_expr_iter_next(iter_a); rule_b = nftnl_expr_iter_next(iter_b); if (rule_a == NULL || rule_b == NULL) - print_err("lshift", "OOM"); + print_err(opname, "OOM"); if (nftnl_expr_iter_next(iter_a) != NULL || nftnl_expr_iter_next(iter_b) != NULL) - print_err("lshift", "More 1 expr."); + print_err(opname, "More 1 expr."); nftnl_expr_iter_destroy(iter_a); nftnl_expr_iter_destroy(iter_b); - cmp_nftnl_expr_lshift(rule_a,rule_b); + cmp_nftnl_expr_shift(opname, rule_a, rule_b); nftnl_rule_free(a); nftnl_rule_free(b); } -static void test_rshift(void) +static void test_lshift(void) { - struct nftnl_rule *a, *b = NULL; - struct nftnl_expr *ex = NULL; - struct nlmsghdr *nlh; - char buf[4096]; - struct nftnl_expr_iter *iter_a, *iter_b = NULL; - struct nftnl_expr *rule_a, *rule_b = NULL; - - a = nftnl_rule_alloc(); - b = nftnl_rule_alloc(); - if (a == NULL || b == NULL) - print_err("rshift", "OOM"); - ex = nftnl_expr_alloc("bitwise"); - if (ex == NULL) - print_err("rshift", "OOM"); - - nftnl_expr_set_u32(ex, NFTNL_EXPR_BITWISE_SREG, 0x12345678); - nftnl_expr_set_u32(ex, NFTNL_EXPR_BITWISE_DREG, 0x78123456); - nftnl_expr_set_u32(ex, NFTNL_EXPR_BITWISE_OP, NFT_BITWISE_RSHIFT); - nftnl_expr_set_u32(ex, NFTNL_EXPR_BITWISE_LEN, 0x56781234); - nftnl_expr_set_u32(ex, NFTNL_EXPR_BITWISE_NBITS, 0x11223344); - nftnl_expr_set_u32(ex, NFTNL_EXPR_BITWISE_DATA, 17); - - nftnl_rule_add_expr(a, ex); - - nlh = nftnl_rule_nlmsg_build_hdr(buf, NFT_MSG_NEWRULE, AF_INET, 0, 1234); - nftnl_rule_nlmsg_build_payload(nlh, a); - - if (nftnl_rule_nlmsg_parse(nlh, b) < 0) - print_err("rshift", "parsing problems"); - - iter_a = nftnl_expr_iter_create(a); - iter_b = nftnl_expr_iter_create(b); - if (iter_a == NULL || iter_b == NULL) - print_err("rshift", "OOM"); - - rule_a = nftnl_expr_iter_next(iter_a); - rule_b = nftnl_expr_iter_next(iter_b); - if (rule_a == NULL || rule_b == NULL) - print_err("rshift", "OOM"); - - if (nftnl_expr_iter_next(iter_a) != NULL || - nftnl_expr_iter_next(iter_b) != NULL) - print_err("rshift", "More 1 expr."); - - nftnl_expr_iter_destroy(iter_a); - nftnl_expr_iter_destroy(iter_b); - - cmp_nftnl_expr_rshift(rule_a,rule_b); + test_shift(NFT_BITWISE_LSHIFT); +} - nftnl_rule_free(a); - nftnl_rule_free(b); +static void test_rshift(void) +{ + test_shift(NFT_BITWISE_RSHIFT); } int main(int argc, char *argv[]) -- 2.35.1