scsi: ufs: make sure all interrupts are processed

[linux-2.6-microblaze.git] / net / netfilter / nft_hash.c

diff --git a/net/netfilter/nft_hash.c b/net/netfilter/nft_hash.c
index c4dad12..24f2f75 100644 (file)
--- a/net/netfilter/nft_hash.c
+++ b/net/netfilter/nft_hash.c
@@ -17,7 +17,7 @@
 #include <net/netfilter/nf_tables_core.h>
 #include <linux/jhash.h>
 
-struct nft_hash {
+struct nft_jhash {
        enum nft_registers      sreg:8;
        enum nft_registers      dreg:8;
        u8                      len;
@@ -27,11 +27,11 @@ struct nft_hash {
        u32                     offset;
 };
 
-static void nft_hash_eval(const struct nft_expr *expr,
-                         struct nft_regs *regs,
-                         const struct nft_pktinfo *pkt)
+static void nft_jhash_eval(const struct nft_expr *expr,
+                          struct nft_regs *regs,
+                          const struct nft_pktinfo *pkt)
 {
-       struct nft_hash *priv = nft_expr_priv(expr);
+       struct nft_jhash *priv = nft_expr_priv(expr);
        const void *data = &regs->data[priv->sreg];
        u32 h;
 
@@ -39,6 +39,25 @@ static void nft_hash_eval(const struct nft_expr *expr,
        regs->data[priv->dreg] = h + priv->offset;
 }
 
+struct nft_symhash {
+       enum nft_registers      dreg:8;
+       u32                     modulus;
+       u32                     offset;
+};
+
+static void nft_symhash_eval(const struct nft_expr *expr,
+                            struct nft_regs *regs,
+                            const struct nft_pktinfo *pkt)
+{
+       struct nft_symhash *priv = nft_expr_priv(expr);
+       struct sk_buff *skb = pkt->skb;
+       u32 h;
+
+       h = reciprocal_scale(__skb_get_hash_symmetric(skb), priv->modulus);
+
+       regs->data[priv->dreg] = h + priv->offset;
+}
+
 static const struct nla_policy nft_hash_policy[NFTA_HASH_MAX + 1] = {
        [NFTA_HASH_SREG]        = { .type = NLA_U32 },
        [NFTA_HASH_DREG]        = { .type = NLA_U32 },
@@ -46,13 +65,14 @@ static const struct nla_policy nft_hash_policy[NFTA_HASH_MAX + 1] = {
        [NFTA_HASH_MODULUS]     = { .type = NLA_U32 },
        [NFTA_HASH_SEED]        = { .type = NLA_U32 },
        [NFTA_HASH_OFFSET]      = { .type = NLA_U32 },
+       [NFTA_HASH_TYPE]        = { .type = NLA_U32 },
 };
 
-static int nft_hash_init(const struct nft_ctx *ctx,
-                        const struct nft_expr *expr,
-                        const struct nlattr * const tb[])
+static int nft_jhash_init(const struct nft_ctx *ctx,
+                         const struct nft_expr *expr,
+                         const struct nlattr * const tb[])
 {
-       struct nft_hash *priv = nft_expr_priv(expr);
+       struct nft_jhash *priv = nft_expr_priv(expr);
        u32 len;
        int err;
 
@@ -95,10 +115,36 @@ static int nft_hash_init(const struct nft_ctx *ctx,
                                           NFT_DATA_VALUE, sizeof(u32));
 }
 
-static int nft_hash_dump(struct sk_buff *skb,
-                        const struct nft_expr *expr)
+static int nft_symhash_init(const struct nft_ctx *ctx,
+                           const struct nft_expr *expr,
+                           const struct nlattr * const tb[])
+{
+       struct nft_symhash *priv = nft_expr_priv(expr);
+
+       if (!tb[NFTA_HASH_DREG]    ||
+           !tb[NFTA_HASH_MODULUS])
+               return -EINVAL;
+
+       if (tb[NFTA_HASH_OFFSET])
+               priv->offset = ntohl(nla_get_be32(tb[NFTA_HASH_OFFSET]));
+
+       priv->dreg = nft_parse_register(tb[NFTA_HASH_DREG]);
+
+       priv->modulus = ntohl(nla_get_be32(tb[NFTA_HASH_MODULUS]));
+       if (priv->modulus <= 1)
+               return -ERANGE;
+
+       if (priv->offset + priv->modulus - 1 < priv->offset)
+               return -EOVERFLOW;
+
+       return nft_validate_register_store(ctx, priv->dreg, NULL,
+                                          NFT_DATA_VALUE, sizeof(u32));
+}
+
+static int nft_jhash_dump(struct sk_buff *skb,
+                         const struct nft_expr *expr)
 {
-       const struct nft_hash *priv = nft_expr_priv(expr);
+       const struct nft_jhash *priv = nft_expr_priv(expr);
 
        if (nft_dump_register(skb, NFTA_HASH_SREG, priv->sreg))
                goto nla_put_failure;
@@ -114,6 +160,28 @@ static int nft_hash_dump(struct sk_buff *skb,
        if (priv->offset != 0)
                if (nla_put_be32(skb, NFTA_HASH_OFFSET, htonl(priv->offset)))
                        goto nla_put_failure;
+       if (nla_put_be32(skb, NFTA_HASH_TYPE, htonl(NFT_HASH_JENKINS)))
+               goto nla_put_failure;
+       return 0;
+
+nla_put_failure:
+       return -1;
+}
+
+static int nft_symhash_dump(struct sk_buff *skb,
+                           const struct nft_expr *expr)
+{
+       const struct nft_symhash *priv = nft_expr_priv(expr);
+
+       if (nft_dump_register(skb, NFTA_HASH_DREG, priv->dreg))
+               goto nla_put_failure;
+       if (nla_put_be32(skb, NFTA_HASH_MODULUS, htonl(priv->modulus)))
+               goto nla_put_failure;
+       if (priv->offset != 0)
+               if (nla_put_be32(skb, NFTA_HASH_OFFSET, htonl(priv->offset)))
+                       goto nla_put_failure;
+       if (nla_put_be32(skb, NFTA_HASH_TYPE, htonl(NFT_HASH_SYM)))
+               goto nla_put_failure;
        return 0;
 
 nla_put_failure:
@@ -121,17 +189,46 @@ nla_put_failure:
 }
 
 static struct nft_expr_type nft_hash_type;
-static const struct nft_expr_ops nft_hash_ops = {
+static const struct nft_expr_ops nft_jhash_ops = {
        .type           = &nft_hash_type,
-       .size           = NFT_EXPR_SIZE(sizeof(struct nft_hash)),
-       .eval           = nft_hash_eval,
-       .init           = nft_hash_init,
-       .dump           = nft_hash_dump,
+       .size           = NFT_EXPR_SIZE(sizeof(struct nft_jhash)),
+       .eval           = nft_jhash_eval,
+       .init           = nft_jhash_init,
+       .dump           = nft_jhash_dump,
 };
 
+static const struct nft_expr_ops nft_symhash_ops = {
+       .type           = &nft_hash_type,
+       .size           = NFT_EXPR_SIZE(sizeof(struct nft_symhash)),
+       .eval           = nft_symhash_eval,
+       .init           = nft_symhash_init,
+       .dump           = nft_symhash_dump,
+};
+
+static const struct nft_expr_ops *
+nft_hash_select_ops(const struct nft_ctx *ctx,
+                   const struct nlattr * const tb[])
+{
+       u32 type;
+
+       if (!tb[NFTA_HASH_TYPE])
+               return &nft_jhash_ops;
+
+       type = ntohl(nla_get_be32(tb[NFTA_HASH_TYPE]));
+       switch (type) {
+       case NFT_HASH_SYM:
+               return &nft_symhash_ops;
+       case NFT_HASH_JENKINS:
+               return &nft_jhash_ops;
+       default:
+               break;
+       }
+       return ERR_PTR(-EOPNOTSUPP);
+}
+
 static struct nft_expr_type nft_hash_type __read_mostly = {
        .name           = "hash",
-       .ops            = &nft_hash_ops,
+       .select_ops     = nft_hash_select_ops,
        .policy         = nft_hash_policy,
        .maxattr        = NFTA_HASH_MAX,
        .owner          = THIS_MODULE,