From mboxrd@z Thu Jan 1 00:00:00 1970 From: Laura Garcia Liebana Subject: [PATCH v3 nft 1/4] src: make hash seed attribute optional Date: Fri, 4 Nov 2016 13:59:31 +0100 Message-ID: <20161104125927.GA20394@sonyv> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii To: netfilter-devel@vger.kernel.org Return-path: Received: from mail-wm0-f65.google.com ([74.125.82.65]:34166 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753178AbcKDM7f (ORCPT ); Fri, 4 Nov 2016 08:59:35 -0400 Received: by mail-wm0-f65.google.com with SMTP id p190so3830744wmp.1 for ; Fri, 04 Nov 2016 05:59:35 -0700 (PDT) Received: from sonyv ([91.126.73.162]) by smtp.gmail.com with ESMTPSA id y3sm14175106wjg.3.2016.11.04.05.59.32 for (version=TLS1_2 cipher=AES128-SHA bits=128/128); Fri, 04 Nov 2016 05:59:33 -0700 (PDT) Content-Disposition: inline Sender: netfilter-devel-owner@vger.kernel.org List-ID: The hash expression requires a seed attribute to call the jhash operation, eg. # nft add rule x y meta mark set jhash ip saddr . ip daddr mod 2 \ seed 0xdeadbeef With this patch the seed attribute is optional and it's generated by a random function from userspace, eg. # nft add rule x y meta mark set jhash ip saddr . ip daddr mod 2 The kernel will take care of generate a random seed. Signed-off-by: Laura Garcia Liebana --- Changes in v3: - The random generation is done in kernel side. - Tests included. src/parser_bison.y | 5 +++++ tests/py/ip/hash.t | 1 + tests/py/ip/hash.t.payload | 7 +++++++ 3 files changed, 13 insertions(+) diff --git a/src/parser_bison.y b/src/parser_bison.y index 17f23c5..82fec99 100644 --- a/src/parser_bison.y +++ b/src/parser_bison.y @@ -2585,6 +2585,11 @@ hash_expr : JHASH expr MOD NUM SEED NUM $$ = hash_expr_alloc(&@$, $4, $6); $$->hash.expr = $2; } + | JHASH expr MOD NUM + { + $$ = hash_expr_alloc(&@$, $4, 0); + $$->hash.expr = $2; + } ; rt_expr : RT rt_key diff --git a/tests/py/ip/hash.t b/tests/py/ip/hash.t index 6dfa965..306ebfd 100644 --- a/tests/py/ip/hash.t +++ b/tests/py/ip/hash.t @@ -2,4 +2,5 @@ *ip;test-ip4;pre ct mark set jhash ip saddr . ip daddr mod 2 seed 0xdeadbeef;ok +ct mark set jhash ip saddr . ip daddr mod 2;ok dnat to jhash ip saddr mod 2 seed 0xdeadbeef map { 0 : 192.168.20.100, 1 : 192.168.30.100 };ok diff --git a/tests/py/ip/hash.t.payload b/tests/py/ip/hash.t.payload index d9a22eb..1188a1b 100644 --- a/tests/py/ip/hash.t.payload +++ b/tests/py/ip/hash.t.payload @@ -5,6 +5,13 @@ ip test-ip4 pre [ hash reg 1 = jhash(reg 2, 8, 0xdeadbeef) % mod 2 ] [ ct set mark with reg 1 ] +# ct mark set jhash ip saddr . ip daddr mod 2 +ip test-ip4 pre + [ payload load 4b @ network header + 12 => reg 2 ] + [ payload load 4b @ network header + 16 => reg 13 ] + [ hash reg 1 = jhash(reg 2, 8, 0x0) % mod 2 ] + [ ct set mark with reg 1 ] + # dnat to jhash ip saddr mod 2 seed 0xdeadbeef map { 0 : 192.168.20.100, 1 : 192.168.30.100 } __map%d test-ip4 b __map%d test-ip4 0 -- 2.9.3