netfilter: nft_meta: Extend support for NFT_META_TSTAMP_NS
Subsystems (2)
PATCH 1/1 netfilter: nft_meta: Extend support for NFT_META_TSTAMP_NS
Meta evaluation function is extended to suport NFT_META_TSTAMP_NS option by exposing the 64 bit timestamp of the packet to two 32 bit registers.
--- include/uapi/linux/netfilter/nf_tables.h | 2 ++ net/netfilter/nft_meta.c | 9 +++++++++ 2 files changed, 11 insertions(+)
include/uapi/linux/netfilter/nf_tables.h +2 -0
@@ -793,6 +793,7 @@ enum nft_exthdr_attributes {* @NFT_META_SECPATH: boolean, secpath_exists (!!skb->sp) * @NFT_META_IIFKIND: packet input interface kind name (dev->rtnl_link_ops->kind) * @NFT_META_OIFKIND: packet output interface kind name (dev->rtnl_link_ops->kind) +* @NFT_META_TSTAMP_NS: packet arriavl time (skb->tstamp) */ enum nft_meta_keys {NFT_META_LEN ,
@@ -823,6 +824,7 @@ enum nft_meta_keys {NFT_META_SECPATH ,NFT_META_IIFKIND ,NFT_META_OIFKIND , + NFT_META_TSTAMP_NS };/**
net/netfilter/nft_meta.c +9 -0
@@ -254,6 +254,13 @@ void nft_meta_get_eval(const struct nft_expr *expr, goto err;strncpy ((char *)dest, out->rtnl_link_ops->kind,IFNAMSIZ );break ; +case NFT_META_TSTAMP_NS : +if (skb->tstamp ==0 ) +__net_timestamp ((struct sk_buff *)skb); +u64 timestamp =ktime_to_ns (skb->tstamp); + *dest = (u32 ) timestamp >>32 ; + *(dest +1 ) = (u32 ) timestamp; +break ;default :WARN_ON (1 ); goto err;
@@ -371,6 +378,8 @@ static int nft_meta_get_init(const struct nft_ctx *ctx, len =IFNAMSIZ ;break ;#endif +case NFT_META_TSTAMP_NS : + len =sizeof (u64);default :return -EOPNOTSUPP ; }
Signature · 1 line
2.17.1
Quoted 5 lines · Karuna Grewal
Meta evaluation function is extended to suport
NFT_META_TSTAMP_NSoption by exposing the 64 bit timestamp of the packet to two 32 bit registers.
+ * @NFT_META_TSTAMP_NS: packet arriavl time (skb->tstamp) */
Please disregard this patch due to the trivial mistake which I've fixed in the latest version.
Hi Karuna,
Thank you for the patch! Perhaps something to improve:
url: https://github.com/0day-ci/linux/commits/Karuna-Grewal/netfilter-nft_meta-Extend-support-for-NFT_META_TSTAMP_NS/20190301-182752 base: https://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git master
smatch warnings:net/netfilter/nft_meta.c:261 nft_meta_get_eval() warn: right shifting more than type allows 32 vs 32
# https://github.com/0day-ci/linux/commit/02c5bd91b2cb1485eeb226b93c885aaa3f7a2a39
git remote add linux-review https://github.com/0day-ci/linux
git remote update linux-review
git checkout 02c5bd91b2cb1485eeb226b93c885aaa3f7a2a39
vim +261 net/netfilter/nft_meta.c
0fb4d2195 wenxu 2019-01-16 247 case NFT_META_IIFKIND:
0fb4d2195 wenxu 2019-01-16 248 if (in == NULL || in->rtnl_link_ops == NULL)
0fb4d2195 wenxu 2019-01-16 249 goto err;
0fb4d2195 wenxu 2019-01-16 250 strncpy((char *)dest, in->rtnl_link_ops->kind, IFNAMSIZ);
0fb4d2195 wenxu 2019-01-16 251 break;
0fb4d2195 wenxu 2019-01-16 252 case NFT_META_OIFKIND:
0fb4d2195 wenxu 2019-01-16 253 if (out == NULL || out->rtnl_link_ops == NULL)
0fb4d2195 wenxu 2019-01-16 254 goto err;
0fb4d2195 wenxu 2019-01-16 255 strncpy((char *)dest, out->rtnl_link_ops->kind, IFNAMSIZ);
0fb4d2195 wenxu 2019-01-16 256 break;
02c5bd91b Karuna Grewal 2019-03-01 257 case NFT_META_TSTAMP_NS:
02c5bd91b Karuna Grewal 2019-03-01 258 if (skb->tstamp == 0)
02c5bd91b Karuna Grewal 2019-03-01 259 __net_timestamp((struct sk_buff *)skb);
02c5bd91b Karuna Grewal 2019-03-01 260 u64 timestamp = ktime_to_ns(skb->tstamp);
02c5bd91b Karuna Grewal 2019-03-01 @261 *dest = (u32) timestamp >> 32;
^^^^^^^^^^^^^^^Missing parentheses. Generally, kernel style is to not put a space after a cast, because casting is a high precedence operation.
02c5bd91b Karuna Grewal 2019-03-01 262 *(dest + 1) = (u32) timestamp; 02c5bd91b Karuna Grewal 2019-03-01 263 break; 96518518c Patrick McHardy 2013-10-14 264 default: 96518518c Patrick McHardy 2013-10-14 265 WARN_ON(1); 96518518c Patrick McHardy 2013-10-14 266 goto err; 96518518c Patrick McHardy 2013-10-14 267 } 96518518c Patrick McHardy 2013-10-14 268 return; 96518518c Patrick McHardy 2013-10-14 269 96518518c Patrick McHardy 2013-10-14 270 err: a55e22e92 Patrick McHardy 2015-04-11 271 regs->verdict.code = NFT_BREAK; 96518518c Patrick McHardy 2013-10-14 272 } 96518518c Patrick McHardy 2013-10-14 273
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation