From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <adrien.mazarguil@6wind.com>
Received: from mail-wm0-f42.google.com (mail-wm0-f42.google.com [74.125.82.42])
 by dpdk.org (Postfix) with ESMTP id 7780610C62
 for <dev@dpdk.org>; Wed, 21 Dec 2016 15:52:39 +0100 (CET)
Received: by mail-wm0-f42.google.com with SMTP id a197so150365314wmd.0
 for <dev@dpdk.org>; Wed, 21 Dec 2016 06:52:39 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=6wind-com.20150623.gappssmtp.com; s=20150623;
 h=from:to:subject:date:message-id:in-reply-to:references;
 bh=MRyX9StXQEZlZqgzfJlaRkP563STsc5XK9btvE+FA+I=;
 b=efBfNiiSYQ7Itm0zNZNrh10WHpNzLTKxvVw48JsA5ZSBFPX9jChU3P/Ff3HrbhYW76
 H4Wc7ixDCTzyx9nxYNUI0tL6RH0tr2+p7Yk3udM/9SE1ZYS0B1yG7DIJ2XdGQdTbfxFF
 VIgQjpQIU2KwMbdpXOsFgsY9cn4D3TNCf2m+zsyqeBd9iCxjmwEgKYqellF35wD19cGu
 ioKiRbTGT1iJXYPFO3cOQ+F8Ps0/jpYXD8ZzoQsXtBiGLocrgUX45DuUwXkdfO/IIt9M
 0Wv4EEfthtIVoBbCPZJADQkhtwHC4nBhmxHDChUwaTYY0D/EPbS3g7s1UmdddA5DfMyj
 xD5A==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to
 :references;
 bh=MRyX9StXQEZlZqgzfJlaRkP563STsc5XK9btvE+FA+I=;
 b=YLpv/j1T2evcwhNyX4hdYqHz0xFRpc56HAobFSBUm3UHeQ0QakeziGOlteLiF1kZ5J
 A80NL42a652qB3E1emqxsk0OKKhVdxVwxtoyEtktEce2/u5KsnLzWlsic5RaE129ymUg
 MCYtaXdV85dNkxfiq5yW6qzH+s6guG/TZaZ35QUWuE5Cf3FG/Qy/EWErCykR5ZV65UrP
 w7MfXnKVLnOYv5ycU/ltSoTpZn2cidlHvHsroYujYpZRaqHGhtTCptv+wEJd0dYKD9EY
 GX/hhmuKobdsSQkLBE4klGc+mGP1KJeqP+d8/SG4OBtUezAv2zKX9D5M8tW36lmuaFqc
 KOEA==
X-Gm-Message-State: AIkVDXK4oCrPkO8yMCNxzyaBEFOd7Z4Lw6kMfDaJWS8JWX57gojPJyU7idSq05rzrEeemb95
X-Received: by 10.28.138.137 with SMTP id m131mr7159414wmd.118.1482331958820; 
 Wed, 21 Dec 2016 06:52:38 -0800 (PST)
Received: from 6wind.com (guy78-3-82-239-227-177.fbx.proxad.net.
 [82.239.227.177])
 by smtp.gmail.com with ESMTPSA id pd2sm30891241wjb.31.2016.12.21.06.52.37
 for <dev@dpdk.org> (version=TLS1_2 cipher=AES128-SHA bits=128/128);
 Wed, 21 Dec 2016 06:52:38 -0800 (PST)
From: Adrien Mazarguil <adrien.mazarguil@6wind.com>
To: dev@dpdk.org
Date: Wed, 21 Dec 2016 15:51:32 +0100
Message-Id: <1ff486893e192371cee783052ee4349ab6b897bb.1482331076.git.adrien.mazarguil@6wind.com>
X-Mailer: git-send-email 2.1.4
In-Reply-To: <cover.1482331076.git.adrien.mazarguil@6wind.com>
References: <cover.1482257521.git.adrien.mazarguil@6wind.com>
 <cover.1482331076.git.adrien.mazarguil@6wind.com>
Subject: [dpdk-dev] [PATCH v5 16/26] app/testpmd: add rte_flow bit-field
	support
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
 <mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
 <mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Dec 2016 14:52:39 -0000

Several rte_flow structures expose bit-fields that cannot be set in a
generic fashion at byte level. Add bit-mask support to handle them.

Signed-off-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>
Acked-by: Olga Shern <olgas@mellanox.com>
---
 app/test-pmd/cmdline_flow.c | 70 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)

diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index 9a6f37d..fc4d824 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -136,6 +136,7 @@ struct arg {
 	uint32_t sign:1; /**< Value is signed. */
 	uint32_t offset; /**< Relative offset from ctx->object. */
 	uint32_t size; /**< Field size. */
+	const uint8_t *mask; /**< Bit-mask to use instead of offset/size. */
 };
 
 /** Parser token definition. */
@@ -195,6 +196,13 @@ struct token {
 		.size = sizeof(((s *)0)->f), \
 	})
 
+/** Static initializer for ARGS() to target a bit-field. */
+#define ARGS_ENTRY_BF(s, f, b) \
+	(&(const struct arg){ \
+		.size = sizeof(s), \
+		.mask = (const void *)&(const s){ .f = (1 << (b)) - 1 }, \
+	})
+
 /** Static initializer for ARGS() to target a pointer. */
 #define ARGS_ENTRY_PTR(s, f) \
 	(&(const struct arg){ \
@@ -623,6 +631,45 @@ push_args(struct context *ctx, const struct arg *arg)
 	return 0;
 }
 
+/** Spread value into buffer according to bit-mask. */
+static size_t
+arg_entry_bf_fill(void *dst, uintmax_t val, const struct arg *arg)
+{
+	uint32_t i = arg->size;
+	uint32_t end = 0;
+	int sub = 1;
+	int add = 0;
+	size_t len = 0;
+
+	if (!arg->mask)
+		return 0;
+#if RTE_BYTE_ORDER == RTE_LITTLE_ENDIAN
+	if (!arg->hton) {
+		i = 0;
+		end = arg->size;
+		sub = 0;
+		add = 1;
+	}
+#endif
+	while (i != end) {
+		unsigned int shift = 0;
+		uint8_t *buf = (uint8_t *)dst + arg->offset + (i -= sub);
+
+		for (shift = 0; arg->mask[i] >> shift; ++shift) {
+			if (!(arg->mask[i] & (1 << shift)))
+				continue;
+			++len;
+			if (!dst)
+				continue;
+			*buf &= ~(1 << shift);
+			*buf |= (val & 1) << shift;
+			val >>= 1;
+		}
+		i += add;
+	}
+	return len;
+}
+
 /**
  * Parse a prefix length and generate a bit-mask.
  *
@@ -649,6 +696,23 @@ parse_prefix(struct context *ctx, const struct token *token,
 	u = strtoumax(str, &end, 0);
 	if (errno || (size_t)(end - str) != len)
 		goto error;
+	if (arg->mask) {
+		uintmax_t v = 0;
+
+		extra = arg_entry_bf_fill(NULL, 0, arg);
+		if (u > extra)
+			goto error;
+		if (!ctx->object)
+			return len;
+		extra -= u;
+		while (u--)
+			(v <<= 1, v |= 1);
+		v <<= extra;
+		if (!arg_entry_bf_fill(ctx->object, v, arg) ||
+		    !arg_entry_bf_fill(ctx->objmask, -1, arg))
+			goto error;
+		return len;
+	}
 	bytes = u / 8;
 	extra = u % 8;
 	size = arg->size;
@@ -1072,6 +1136,12 @@ parse_int(struct context *ctx, const struct token *token,
 		goto error;
 	if (!ctx->object)
 		return len;
+	if (arg->mask) {
+		if (!arg_entry_bf_fill(ctx->object, u, arg) ||
+		    !arg_entry_bf_fill(ctx->objmask, -1, arg))
+			goto error;
+		return len;
+	}
 	buf = (uint8_t *)ctx->object + arg->offset;
 	size = arg->size;
 objmask:
-- 
2.1.4