From patchwork Sun Jul 19 20:21:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathias Krause X-Patchwork-Id: 497525 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 22504140770 for ; Mon, 20 Jul 2015 06:21:45 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=googlemail.com header.i=@googlemail.com header.b=QMS6bOUj; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753662AbbGSUVb (ORCPT ); Sun, 19 Jul 2015 16:21:31 -0400 Received: from mail-wg0-f54.google.com ([74.125.82.54]:34520 "EHLO mail-wg0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753229AbbGSUVa (ORCPT ); Sun, 19 Jul 2015 16:21:30 -0400 Received: by wgkl9 with SMTP id l9so116749661wgk.1; Sun, 19 Jul 2015 13:21:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=5yb6HdOX9psH5plPlOP8HfoQh4QMFo4WMRZPH5Kj6vA=; b=QMS6bOUjQwEPyvEDH2dMim8wSPtzcqv0tvYAZxdPBcGfu6fuwhc5Fe3OFgGSbkAYbF JoS6+adAa/bZmP8T9mvpgxN6iFpMg7gpytG4EAeAlmXX0iUPCZ3eOC7fL+LGkoOvc/SK tKIwj3QMd8A3gjIOM9mcTFN+F2pL759xRT6mgvKDsEGlz+q5jkffJh6xto3DFM3/kyT0 iHdgFJQ31u98KRLSHuW7uC0GYCpdhMHzbzLTK4Fru5/6EBhedmFvdaQUy6aQCT1RS21j l1lLHjtDymudjpjHqV21GqW9k01712O2lnVSehaSwkxmAhMZxpkkzjmuetILIhdmSYGw 36ag== X-Received: by 10.180.38.78 with SMTP id e14mr15531492wik.10.1437337289474; Sun, 19 Jul 2015 13:21:29 -0700 (PDT) Received: from jig.fritz.box (p54B317B9.dip0.t-ipconnect.de. [84.179.23.185]) by smtp.gmail.com with ESMTPSA id h9sm28611919wjx.20.2015.07.19.13.21.28 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 19 Jul 2015 13:21:28 -0700 (PDT) From: Mathias Krause To: "David S. Miller" , Pablo Neira Ayuso , Patrick McHardy , Jozsef Kadlecsik Cc: netdev@vger.kernel.org, netfilter-devel@vger.kernel.org, Mathias Krause Subject: [PATCHv2 net-next] net: #ifdefify sk_classid member of struct sock Date: Sun, 19 Jul 2015 22:21:13 +0200 Message-Id: <1437337273-16775-1-git-send-email-minipli@googlemail.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 sk_classid member is only required when CONFIG_CGROUP_NET_CLASSID is enabled. #ifdefify it to reduce the size of struct sock on 32 bit systems, at least. Signed-off-by: Mathias Krause --- v2: - ensure we'll error out in nft_meta_get_init() if CONFIG_CGROUP_NET_CLASSID is not set include/net/sock.h | 2 ++ net/netfilter/nft_meta.c | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/include/net/sock.h b/include/net/sock.h index 05a8c1aea251..4353ef70bf48 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -429,7 +429,9 @@ struct sock { void *sk_security; #endif __u32 sk_mark; +#ifdef CONFIG_CGROUP_NET_CLASSID u32 sk_classid; +#endif struct cg_proto *sk_cgrp; void (*sk_state_change)(struct sock *sk); void (*sk_data_ready)(struct sock *sk); diff --git a/net/netfilter/nft_meta.c b/net/netfilter/nft_meta.c index 52561e1c31e2..cb2f13ebb5a6 100644 --- a/net/netfilter/nft_meta.c +++ b/net/netfilter/nft_meta.c @@ -166,11 +166,13 @@ void nft_meta_get_eval(const struct nft_expr *expr, goto err; *dest = out->group; break; +#ifdef CONFIG_CGROUP_NET_CLASSID case NFT_META_CGROUP: if (skb->sk == NULL || !sk_fullsock(skb->sk)) goto err; *dest = skb->sk->sk_classid; break; +#endif default: WARN_ON(1); goto err; @@ -246,7 +248,9 @@ int nft_meta_get_init(const struct nft_ctx *ctx, case NFT_META_CPU: case NFT_META_IIFGROUP: case NFT_META_OIFGROUP: +#ifdef CONFIG_CGROUP_NET_CLASSID case NFT_META_CGROUP: +#endif len = sizeof(u32); break; case NFT_META_IIFNAME: