From patchwork Mon Nov 3 17:10:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ana Rey X-Patchwork-Id: 406311 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3E4B814007F for ; Tue, 4 Nov 2014 04:10:41 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752082AbaKCRKk (ORCPT ); Mon, 3 Nov 2014 12:10:40 -0500 Received: from mail-wg0-f42.google.com ([74.125.82.42]:60520 "EHLO mail-wg0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751311AbaKCRKj (ORCPT ); Mon, 3 Nov 2014 12:10:39 -0500 Received: by mail-wg0-f42.google.com with SMTP id k14so11642686wgh.15 for ; Mon, 03 Nov 2014 09:10:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=KI5JAMjbhnWX+6jJW8SWUg1VXFGuBbosQkxp1/SlIzY=; b=sQpM+dnhVPSVrj2+lJoGFTEkSlp8guSMxdDHSqSCvI2UEY5l9yEQYTWhaRc5rtSoLf 1dINliD6uLUYr2nvBS5uF40AW6XiPaHtQhpMBRz23Q0r/c9p94ZxIgTeh6wWtc6G0jii 9jR1UtkOim9/OR6GA+BAZWyoHHqvDHWotykTgvYeX77MrbzZCK2wwGCmJp92WQJHEZ1V 5Tujf6W/8mjpk7pOmDxjoFMHd4iW33hMk8hiqafRMVuadVym5KbqDB4JKnAuU8MPXVw7 OVxhBP4NQoa76DlPflk0QdQKjL0FX9M6Rv/P6l7GgEd/51thl8PiE4GqrkZumoVwK2mZ 9M6Q== X-Received: by 10.194.187.164 with SMTP id ft4mr48909366wjc.76.1415034638525; Mon, 03 Nov 2014 09:10:38 -0800 (PST) Received: from localhost.localdomain ([77.231.225.146]) by mx.google.com with ESMTPSA id td9sm9372951wic.15.2014.11.03.09.10.36 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Nov 2014 09:10:37 -0800 (PST) From: Ana Rey To: netfilter-devel@vger.kernel.org Cc: dborkman@redhat.com, Ana Rey Subject: [libnftnf PATCH] expr: meta: Add cgroup support Date: Mon, 3 Nov 2014 18:10:49 +0100 Message-Id: <1415034651-27242-1-git-send-email-anarey@gmail.com> X-Mailer: git-send-email 1.7.10.4 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org The kernel support is add in the commit: netfilter: nft_meta: add cgroup support Signed-off-by: Ana Rey --- include/linux/netfilter/nf_tables.h | 2 ++ src/expr/meta.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/include/linux/netfilter/nf_tables.h b/include/linux/netfilter/nf_tables.h index bb21315..a8d3a49 100644 --- a/include/linux/netfilter/nf_tables.h +++ b/include/linux/netfilter/nf_tables.h @@ -579,6 +579,7 @@ enum nft_exthdr_attributes { * @NFT_META_CPU: cpu id through smp_processor_id() * @NFT_META_IIFGROUP: packet input interface group * @NFT_META_OIFGROUP: packet output interface group + * @NFT_META_CGROUP: packet cgroup (skb->sk->sk_classid) */ enum nft_meta_keys { NFT_META_LEN, @@ -604,6 +605,7 @@ enum nft_meta_keys { NFT_META_CPU, NFT_META_IIFGROUP, NFT_META_OIFGROUP, + NFT_META_CGROUP, }; /** diff --git a/src/expr/meta.c b/src/expr/meta.c index 5b5159f..59cb55b 100644 --- a/src/expr/meta.c +++ b/src/expr/meta.c @@ -23,7 +23,7 @@ #include "expr_ops.h" #ifndef NFT_META_MAX -#define NFT_META_MAX (NFT_META_OIFGROUP + 1) +#define NFT_META_MAX (NFT_META_CGROUP + 1) #endif struct nft_expr_meta { @@ -157,6 +157,7 @@ static const char *meta_key2str_array[NFT_META_MAX] = { [NFT_META_CPU] = "cpu", [NFT_META_IIFGROUP] = "iifgroup", [NFT_META_OIFGROUP] = "oifgroup", + [NFT_META_CGROUP] = "cgroup", }; static const char *meta_key2str(uint8_t key)