Hitherto, the kernel has required constant values for the xor and mask
attributes of boolean bitwise expressions. This has meant that the
righthand argument of a boolean binop must be constant. Now the kernel
supports passing mask and xor via registers, we need to be able to
generate and parse bitwise boolean expressions that do this.
Signed-off-by: Jeremy Sowden <jeremy@xxxxxxxxxx>
---
src/netlink_delinearize.c | 83 +++++++++++++++++++++++++++++++---
src/netlink_linearize.c | 95 +++++++++++++++++++++++++++++++++++++--
2 files changed, 167 insertions(+), 11 deletions(-)
diff --git a/src/netlink_delinearize.c b/src/netlink_delinearize.c
index 79efda123c14..4fc7b764d7a9 100644
--- a/src/netlink_delinearize.c
+++ b/src/netlink_delinearize.c
@@ -363,11 +363,12 @@ static void netlink_parse_lookup(struct netlink_parse_ctx *ctx,
ctx->stmt = expr_stmt_alloc(loc, expr);
}
-static struct expr *netlink_parse_bitwise_bool(struct netlink_parse_ctx *ctx,
- const struct location *loc,
- const struct nftnl_expr *nle,
- enum nft_registers sreg,
- struct expr *left)
+static struct expr *
+netlink_parse_bitwise_bool_constant(struct netlink_parse_ctx *ctx,
+ const struct location *loc,
+ const struct nftnl_expr *nle,
+ enum nft_registers sreg,
+ struct expr *left)
{
struct nft_data_delinearize nld;
@@ -428,6 +429,69 @@ static struct expr *netlink_parse_bitwise_bool(struct netlink_parse_ctx *ctx,
return expr;
}
+static struct expr *
+netlink_parse_bitwise_bool_variable(struct netlink_parse_ctx *ctx,
+ const struct location *loc,
+ const struct nftnl_expr *nle,
+ enum nft_registers sreg,
+ struct expr *left)
+
+{
+ enum nft_registers mreg, xreg;
+ struct expr *mask, *xor;
+
+ if (nftnl_expr_is_set(nle, NFTNL_EXPR_BITWISE_MASK)) {
+ /*
+ * a ^ b = (a & 1) ^ b.
+ */
+ xreg = netlink_parse_register(nle, NFTNL_EXPR_BITWISE_XREG);
+ xor = netlink_get_register(ctx, loc, xreg);
+ if (xor == NULL) {
+ netlink_error(ctx, loc,
+ "Bitwise expression has no xor expression");
+ return NULL;
+ }
+ return binop_expr_alloc(loc, OP_XOR, left, xor);
+ }
+
+ if (nftnl_expr_is_set(nle, NFTNL_EXPR_BITWISE_XOR)) {
+ /*
+ * a & b = (a & b) ^ 0.
+ */
+ mreg = netlink_parse_register(nle, NFTNL_EXPR_BITWISE_MREG);
+ mask = netlink_get_register(ctx, loc, mreg);
+ if (mask == NULL) {
+ netlink_error(ctx, loc,
+ "Bitwise expression has no mask expression");
+ return NULL;
+ }
+ return binop_expr_alloc(loc, OP_AND, left, mask);
+ }
+
+ /*
+ * a | b = (a & ~b) ^ b.
+ */
+ mreg = netlink_parse_register(nle, NFTNL_EXPR_BITWISE_MREG);
+ mask = netlink_get_register(ctx, loc, mreg);
+ if (mask == NULL) {
+ netlink_error(ctx, loc,
+ "Bitwise expression has no mask expression");
+ return NULL;
+ }
+
+ expr_free(mask);
+
+ xreg = netlink_parse_register(nle, NFTNL_EXPR_BITWISE_XREG);
+ xor = netlink_get_register(ctx, loc, xreg);
+ if (xor == NULL) {
+ netlink_error(ctx, loc,
+ "Bitwise expression has no xor expression");
+ return NULL;
+ }
+
+ return binop_expr_alloc(loc, OP_OR, left, xor);
+}
+
static struct expr *netlink_parse_bitwise_shift(struct netlink_parse_ctx *ctx,
const struct location *loc,
const struct nftnl_expr *nle,
@@ -467,8 +531,13 @@ static void netlink_parse_bitwise(struct netlink_parse_ctx *ctx,
switch (op) {
case NFT_BITWISE_BOOL:
- expr = netlink_parse_bitwise_bool(ctx, loc, nle, sreg,
- left);
+ if (nftnl_expr_is_set(nle, NFTNL_EXPR_BITWISE_MASK) &&
+ nftnl_expr_is_set(nle, NFTNL_EXPR_BITWISE_XOR))
+ expr = netlink_parse_bitwise_bool_constant(ctx, loc, nle,
+ sreg, left);
+ else
+ expr = netlink_parse_bitwise_bool_variable(ctx, loc, nle,
+ sreg, left);
break;
case NFT_BITWISE_LSHIFT:
expr = netlink_parse_bitwise_shift(ctx, loc, nle, OP_LSHIFT,
diff --git a/src/netlink_linearize.c b/src/netlink_linearize.c
index de461775a7e1..b2987efbc49f 100644
--- a/src/netlink_linearize.c
+++ b/src/netlink_linearize.c
@@ -572,9 +572,9 @@ static void netlink_gen_shift(struct netlink_linearize_ctx *ctx,
nftnl_rule_add_expr(ctx->nlr, nle);
}
-static void netlink_gen_bitwise(struct netlink_linearize_ctx *ctx,
- const struct expr *expr,
- enum nft_registers dreg)
+static void netlink_gen_bitwise_constant(struct netlink_linearize_ctx *ctx,
+ const struct expr *expr,
+ enum nft_registers dreg)
{
struct nftnl_expr *nle;
struct nft_data_linearize nld;
@@ -642,6 +642,89 @@ static void netlink_gen_bitwise(struct netlink_linearize_ctx *ctx,
nftnl_rule_add_expr(ctx->nlr, nle);
}
+static void netlink_gen_bitwise_variable(struct netlink_linearize_ctx *ctx,
+ const struct expr *expr,
+ enum nft_registers dreg)
+{
+ struct nft_data_linearize nld;
+ enum nft_registers mreg, xreg;
+ struct nftnl_expr *nle;
+ unsigned int len;
+ mpz_t m, x;
+
+ netlink_gen_expr(ctx, expr->left, dreg);
+
+ len = div_round_up(expr->len, BITS_PER_BYTE);
+
+ nle = alloc_nft_expr("bitwise");
+
+ switch (expr->op) {
+ case OP_XOR:
+ /*
+ * a ^ b = (a & 1) ^ b.
+ */
+ mpz_init_bitmask(m, expr->len);
+ netlink_gen_raw_data(m, expr->byteorder, len, &nld);
+ nftnl_expr_set(nle, NFTNL_EXPR_BITWISE_MASK, nld.value, nld.len);
+ mpz_clear(m);
+
+ xreg = get_register(ctx, expr->right);
+ netlink_gen_expr(ctx, expr->right, xreg);
+ netlink_put_register(nle, NFTNL_EXPR_BITWISE_XREG, xreg);
+ break;
+ case OP_AND:
+ /*
+ * a & b = (a & b) ^ 0.
+ */
+ mreg = get_register(ctx, expr->right);
+ netlink_gen_expr(ctx, expr->right, mreg);
+ netlink_put_register(nle, NFTNL_EXPR_BITWISE_MREG, mreg);
+
+ mpz_init_set_ui(x, 0);
+ netlink_gen_raw_data(x, expr->byteorder, len, &nld);
+ nftnl_expr_set(nle, NFTNL_EXPR_BITWISE_XOR, nld.value, nld.len);
+ mpz_clear(x);
+ break;
+ case OP_OR: {
+ /*
+ * a | b = (a & ~b) ^ b
+ * = (a & (b ^ 1)) ^ b.
+ */
+ struct expr *one, *not;
+ unsigned long tmp;
+
+ mpz_init_bitmask(m, expr->right->len);
+ tmp = mpz_get_ui(m);
+ mpz_clear(m);
+
+ one = constant_expr_alloc(&expr->location, &integer_type,
+ expr->right->byteorder,
+ expr->right->len, &tmp);
+ not = binop_expr_alloc(&expr->location, OP_XOR,
+ expr_get(expr->right), one);
+ not->len = expr->right->len;
+ mreg = get_register(ctx, not);
+ netlink_gen_expr(ctx, not, mreg);
+ netlink_put_register(nle, NFTNL_EXPR_BITWISE_MREG, mreg);
+ expr_free(not);
+
+ xreg = get_register(ctx, expr->right);
+ netlink_gen_expr(ctx, expr->right, xreg);
+ netlink_put_register(nle, NFTNL_EXPR_BITWISE_XREG, xreg);
+ break;
+ }
+ default:
+ BUG("invalid binary operation %u\n", expr->op);
+ }
+
+ netlink_put_register(nle, NFTNL_EXPR_BITWISE_SREG, dreg);
+ netlink_put_register(nle, NFTNL_EXPR_BITWISE_DREG, dreg);
+ nftnl_expr_set_u32(nle, NFTNL_EXPR_BITWISE_OP, NFT_BITWISE_BOOL);
+ nftnl_expr_set_u32(nle, NFTNL_EXPR_BITWISE_LEN, len);
+
+ nftnl_rule_add_expr(ctx->nlr, nle);
+}
+
static void netlink_gen_binop(struct netlink_linearize_ctx *ctx,
const struct expr *expr,
enum nft_registers dreg)
@@ -652,7 +735,11 @@ static void netlink_gen_binop(struct netlink_linearize_ctx *ctx,
netlink_gen_shift(ctx, expr, dreg);
break;
default:
- netlink_gen_bitwise(ctx, expr, dreg);
+ if (expr_is_constant(expr->right)) {
+ netlink_gen_bitwise_constant(ctx, expr, dreg);
+ } else {
+ netlink_gen_bitwise_variable(ctx, expr, dreg);
+ }
break;
}
}
--
2.25.1
