[NET]: Introduce RTA_TABLE/FRA_TABLE attributes

Introduce RTA_TABLE route attribute and FRA_TABLE routing rule attribute
to hold 32 bit routing table IDs. Usespace compatibility is provided by
continuing to accept and send the rtm_table field, but because of its
limited size it can only carry the low 8 bits of the table ID. This
implies that if larger IDs are used, _all_ userspace programs using them
need to use RTA_TABLE.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 19 insertions, 0 deletions

diff --git a/include/linux/fib_rules.h b/include/linux/fib_rules.h
index 5e503f0ca6e4..19a82b6c1c1f 100644
--- a/include/linux/fib_rules.h
+++ b/include/linux/fib_rules.h
@@ -36,6 +36,10 @@ enum
         FRA_UNUSED5,
         FRA_FWMARK,     /* netfilter mark (IPv4) */
         FRA_FLOW,       /* flow/class id */
+        FRA_UNUSED6,
+        FRA_UNUSED7,
+        FRA_UNUSED8,
+        FRA_TABLE,      /* Extended table id */
         __FRA_MAX
 };
 
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index 0aaffa2ae666..ea422a539a03 100644
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -264,6 +264,7 @@ enum rtattr_type_t
         RTA_CACHEINFO,
         RTA_SESSION,
         RTA_MP_ALGO,
+        RTA_TABLE,
         __RTA_MAX
 };
 
@@ -717,6 +718,13 @@ extern void __rtnl_unlock(void);
         } \
 } while(0)
 
+static inline u32 rtm_get_table(struct rtattr **rta, u8 table)
+{
+        return RTA_GET_U32(rta[RTA_TABLE-1]);
+rtattr_failure:
+        return table;
+}
+
 #endif /* __KERNEL__ */
 
 
diff --git a/include/net/fib_rules.h b/include/net/fib_rules.h
index 61375d9e53f8..8e2f473d3e82 100644
--- a/include/net/fib_rules.h
+++ b/include/net/fib_rules.h
@@ -74,6 +74,13 @@ static inline void fib_rule_put(struct fib_rule *rule)
                 call_rcu(&rule->rcu, fib_rule_put_rcu);
 }
 
+static inline u32 frh_get_table(struct fib_rule_hdr *frh, struct nlattr **nla)
+{
+        if (nla[FRA_TABLE])
+                return nla_get_u32(nla[FRA_TABLE]);
+        return frh->table;
+}
+
 extern int                      fib_rules_register(struct fib_rules_ops *);
 extern int                      fib_rules_unregister(struct fib_rules_ops *);