From patchwork Wed Nov 16 16:23:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrien Mazarguil X-Patchwork-Id: 17038 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 76946D4C2; Wed, 16 Nov 2016 17:25:33 +0100 (CET) Received: from mail-wm0-f51.google.com (mail-wm0-f51.google.com [74.125.82.51]) by dpdk.org (Postfix) with ESMTP id 928575684 for ; Wed, 16 Nov 2016 17:24:39 +0100 (CET) Received: by mail-wm0-f51.google.com with SMTP id g23so250224729wme.1 for ; Wed, 16 Nov 2016 08:24:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=c6gF8TuGD8kHq5ox5WIwjQiktpcI5YJsNK4+fkkUH2E=; b=OYhohAe7BhXktVPnMX2MnplyNYTYRcO4ilBLD2eAgW/wRWCRr9btsm0UQeYxUh54JW Q7UQcb5qUa3mlI0UZ1BdcBUlyIgrFFmFI/BQFjnD6OVsHCoh6wIwd+Sg4QfBf4PQNaeV ccr0Hs55p7/LKkr7gleOn/5EmGK7p5J8nlsevTPm/hhWXHBU3x7MI9GKn4gaU9vaNuI4 o7d9KbQbboJZn8PLdwPHD3cc2S24hlqLZcqU7qbN82MVYH9lUyQD6a11LH5JpF7l2QdY odUFtMGZoJCPt6SysMiHqmgvsYMvUt/9WrHVr97JJEb6H/GZVB+fUUNoX4dUk4tL6rHi GBDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=c6gF8TuGD8kHq5ox5WIwjQiktpcI5YJsNK4+fkkUH2E=; b=Vw4XLLtMeFPRlhh4ci0jrrJYtsXzEmfMp1TANrvhT9GgDWHmbtYe2C8L4zN+3AidZm MCvRR3SNMghn0G6tLLzU9dYI0bpFLToNdbqiJ1KZ39riqByP5OKdnTP9A0LznqiEZyhF oyG15IfjFo2l4p2WFbWELffll+LMRMOndjo9K/eKXx/7/BBmn1P7WQlLINIb+AzidtZy HV3neIBZFD+nwMCkraOsJjVqddGnjhoacpeCluoj6NT6z9cxuTFVlPQVfYPtN8cq1Ylx tkw7uPtFx0aa/WM2sQRKNNzH1vC55QlWdh8k2DdjTlA3CMqDyrqxo5bzsqXM3ozMxJGo tsIg== X-Gm-Message-State: ABUngvd3mT/Qcpj8iGIg1y3fGD32ze6RZFaL9Py4g2qB3hqp/zfsaj9RVdHWynYE77VI/UR7 X-Received: by 10.28.71.1 with SMTP id u1mr10534626wma.128.1479313479098; Wed, 16 Nov 2016 08:24:39 -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 n17sm319025wjq.6.2016.11.16.08.24.38 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Wed, 16 Nov 2016 08:24:38 -0800 (PST) From: Adrien Mazarguil To: dev@dpdk.org Cc: Thomas Monjalon , Pablo de Lara , Olivier Matz Date: Wed, 16 Nov 2016 17:23:40 +0100 Message-Id: <3bb5f6dcd2ae514d878b39ed904c30dbf5868a1d.1479309720.git.adrien.mazarguil@6wind.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: Subject: [dpdk-dev] [PATCH 14/22] app/testpmd: add rte_flow bit-field support X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 --- app/test-pmd/cmdline_flow.c | 59 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index 89307cb..81930e1 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) \ + (&(const struct arg){ \ + .size = sizeof(s), \ + .mask = (const void *)&(const s){ .f = -1 }, \ + }) + /** Static initializer for ARGS() to target a pointer. */ #define ARGS_ENTRY_PTR(s, f) \ (&(const struct arg){ \ @@ -622,6 +630,34 @@ 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; + size_t len = 0; + + /* Endian conversion is not supported on bit-fields. */ + if (!arg->mask || arg->hton) + return 0; + for (i = 0; i != arg->size; ++i) { + unsigned int shift = 0; + uint8_t *buf = (uint8_t *)dst + i; + + 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; + } + } + return len; +} + /** * Parse a prefix length and generate a bit-mask. * @@ -648,6 +684,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; @@ -1071,6 +1124,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: