From patchwork Thu Mar 27 21:54:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pablo Neira Ayuso X-Patchwork-Id: 334479 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 9F845140092 for ; Fri, 28 Mar 2014 08:55:01 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757413AbaC0VzA (ORCPT ); Thu, 27 Mar 2014 17:55:00 -0400 Received: from mail.us.es ([193.147.175.20]:49657 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756835AbaC0VzA (ORCPT ); Thu, 27 Mar 2014 17:55:00 -0400 Received: (qmail 26262 invoked from network); 27 Mar 2014 22:54:57 +0100 Received: from unknown (HELO us.es) (192.168.2.11) by us.es with SMTP; 27 Mar 2014 22:54:57 +0100 Received: (qmail 23781 invoked by uid 507); 27 Mar 2014 21:54:57 -0000 X-Qmail-Scanner-Diagnostics: from 127.0.0.1 by antivirus1 (envelope-from , uid 501) with qmail-scanner-2.10 (clamdscan: 0.98.1/18706. spamassassin: 3.3.2. Clear:RC:1(127.0.0.1):SA:0(-102.2/7.5):. Processed in 2.129285 secs); 27 Mar 2014 21:54:57 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on antivirus1 X-Spam-Level: X-Spam-Status: No, score=-102.2 required=7.5 tests=ALL_TRUSTED,BAYES_50, SMTPAUTH_US,USER_IN_WHITELIST autolearn=disabled version=3.3.2 X-Spam-ASN: X-Envelope-From: pablo@netfilter.org Received: from unknown (HELO antivirus1) (127.0.0.1) by us.es with SMTP; 27 Mar 2014 21:54:55 -0000 Received: from 192.168.1.13 (192.168.1.13) by antivirus1 (F-Secure/fsigk_smtp/412/antivirus1); Thu, 27 Mar 2014 22:54:55 +0100 (CET) X-Virus-Status: clean(F-Secure/fsigk_smtp/412/antivirus1) Received: (qmail 3818 invoked from network); 27 Mar 2014 22:54:55 +0100 Received: from unknown (HELO soleta.us.es) (pneira@us.es@10.100.44.199) by mail.us.es with SMTP; 27 Mar 2014 22:54:55 +0100 From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Cc: kaber@trash.net Subject: [PATCH 2/3 nft] src: add chain netlink messages to the batch Date: Thu, 27 Mar 2014 22:54:50 +0100 Message-Id: <1395957291-5018-2-git-send-email-pablo@netfilter.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1395957291-5018-1-git-send-email-pablo@netfilter.org> References: <1395957291-5018-1-git-send-email-pablo@netfilter.org> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org This patch moves the chain netlink messages to the big netlink batch that is sent to kernel-space. Signed-off-by: Pablo Neira Ayuso --- include/mnl.h | 4 ++ src/mnl.c | 35 ++++++++++++++++ src/netlink.c | 126 +++++++++++++++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 158 insertions(+), 7 deletions(-) diff --git a/include/mnl.h b/include/mnl.h index f328fc9..461f2c2 100644 --- a/include/mnl.h +++ b/include/mnl.h @@ -35,8 +35,12 @@ struct nft_rule_list *mnl_nft_rule_dump(struct mnl_socket *nf_sock, int mnl_nft_chain_add(struct mnl_socket *nf_sock, struct nft_chain *nlc, unsigned int flags); +int mnl_nft_chain_batch_add(struct mnl_socket *nf_sock, struct nft_chain *nlc, + unsigned int flags); int mnl_nft_chain_delete(struct mnl_socket *nf_sock, struct nft_chain *nlc, unsigned int flags); +int mnl_nft_chain_batch_del(struct mnl_socket *nf_sock, struct nft_chain *nlc, + unsigned int flags); struct nft_chain_list *mnl_nft_chain_dump(struct mnl_socket *nf_sock, int family); int mnl_nft_chain_get(struct mnl_socket *nf_sock, struct nft_chain *nlc, diff --git a/src/mnl.c b/src/mnl.c index 2565bcd..d1a21f9 100644 --- a/src/mnl.c +++ b/src/mnl.c @@ -412,6 +412,24 @@ int mnl_nft_chain_add(struct mnl_socket *nf_sock, struct nft_chain *nlc, return mnl_talk(nf_sock, nlh, nlh->nlmsg_len, NULL, NULL); } +int mnl_nft_chain_batch_add(struct mnl_socket *nf_sock, struct nft_chain *nlc, + unsigned int flags) + +{ + struct nlmsghdr *nlh; + + nlh = nft_chain_nlmsg_build_hdr(mnl_nlmsg_batch_current(batch), + NFT_MSG_NEWCHAIN, + nft_chain_attr_get_u32(nlc, NFT_CHAIN_ATTR_FAMILY), + NLM_F_CREATE | NLM_F_ACK | flags, seq); + nft_chain_nlmsg_build_payload(nlh, nlc); + + if (!mnl_nlmsg_batch_next(batch)) + mnl_batch_page_add(); + + return 0; +} + int mnl_nft_chain_delete(struct mnl_socket *nf_sock, struct nft_chain *nlc, unsigned int flags) { @@ -426,6 +444,23 @@ int mnl_nft_chain_delete(struct mnl_socket *nf_sock, struct nft_chain *nlc, return mnl_talk(nf_sock, nlh, nlh->nlmsg_len, NULL, NULL); } +int mnl_nft_chain_batch_del(struct mnl_socket *nf_sock, struct nft_chain *nlc, + unsigned int flags) +{ + struct nlmsghdr *nlh; + + nlh = nft_chain_nlmsg_build_hdr(mnl_nlmsg_batch_current(batch), + NFT_MSG_DELCHAIN, + nft_chain_attr_get_u32(nlc, NFT_CHAIN_ATTR_FAMILY), + NLM_F_ACK, seq); + nft_chain_nlmsg_build_payload(nlh, nlc); + + if (!mnl_nlmsg_batch_next(batch)) + mnl_batch_page_add(); + + return 0; +} + static int chain_cb(const struct nlmsghdr *nlh, void *data) { struct nft_chain_list *nlc_list = data; diff --git a/src/netlink.c b/src/netlink.c index 922a596..a78b284 100644 --- a/src/netlink.c +++ b/src/netlink.c @@ -441,9 +441,10 @@ void netlink_dump_chain(struct nft_chain *nlc) #endif } -int netlink_add_chain(struct netlink_ctx *ctx, const struct handle *h, - const struct location *loc, const struct chain *chain, - bool excl) +static int netlink_add_chain_compat(struct netlink_ctx *ctx, + const struct handle *h, + const struct location *loc, + const struct chain *chain, bool excl) { struct nft_chain *nlc; int err; @@ -467,8 +468,52 @@ int netlink_add_chain(struct netlink_ctx *ctx, const struct handle *h, return err; } -int netlink_rename_chain(struct netlink_ctx *ctx, const struct handle *h, - const struct location *loc, const char *name) +static int netlink_add_chain_batch(struct netlink_ctx *ctx, + const struct handle *h, + const struct location *loc, + const struct chain *chain, bool excl) +{ + struct nft_chain *nlc; + int err; + + nlc = alloc_nft_chain(h); + if (chain != NULL && chain->flags & CHAIN_F_BASECHAIN) { + nft_chain_attr_set_u32(nlc, NFT_CHAIN_ATTR_HOOKNUM, + chain->hooknum); + nft_chain_attr_set_u32(nlc, NFT_CHAIN_ATTR_PRIO, + chain->priority); + nft_chain_attr_set_str(nlc, NFT_CHAIN_ATTR_TYPE, + chain->type); + } + netlink_dump_chain(nlc); + err = mnl_nft_chain_batch_add(nf_sock, nlc, excl ? NLM_F_EXCL : 0); + nft_chain_free(nlc); + + if (err < 0) { + netlink_io_error(ctx, loc, "Could not add chain: %s", + strerror(errno)); + } + return err; +} + +int netlink_add_chain(struct netlink_ctx *ctx, const struct handle *h, + const struct location *loc, const struct chain *chain, + bool excl) +{ + int ret; + + if (ctx->batch_supported) + ret = netlink_add_chain_batch(ctx, h, loc, chain, excl); + else + ret = netlink_add_chain_compat(ctx, h, loc, chain, excl); + + return ret; +} + +static int netlink_rename_chain_compat(struct netlink_ctx *ctx, + const struct handle *h, + const struct location *loc, + const char *name) { struct nft_chain *nlc; int err; @@ -485,8 +530,43 @@ int netlink_rename_chain(struct netlink_ctx *ctx, const struct handle *h, return err; } -int netlink_delete_chain(struct netlink_ctx *ctx, const struct handle *h, - const struct location *loc) +static int netlink_rename_chain_batch(struct netlink_ctx *ctx, + const struct handle *h, + const struct location *loc, + const char *name) +{ + struct nft_chain *nlc; + int err; + + nlc = alloc_nft_chain(h); + nft_chain_attr_set_str(nlc, NFT_CHAIN_ATTR_NAME, name); + netlink_dump_chain(nlc); + err = mnl_nft_chain_batch_add(nf_sock, nlc, 0); + nft_chain_free(nlc); + + if (err < 0) { + netlink_io_error(ctx, loc, "Could not rename chain: %s", + strerror(errno)); + } + return err; +} + +int netlink_rename_chain(struct netlink_ctx *ctx, const struct handle *h, + const struct location *loc, const char *name) +{ + int ret; + + if (ctx->batch_supported) + ret = netlink_rename_chain_batch(ctx, h, loc, name); + else + ret = netlink_rename_chain_compat(ctx, h, loc, name); + + return ret; +} + +static int netlink_del_chain_compat(struct netlink_ctx *ctx, + const struct handle *h, + const struct location *loc) { struct nft_chain *nlc; int err; @@ -496,12 +576,44 @@ int netlink_delete_chain(struct netlink_ctx *ctx, const struct handle *h, err = mnl_nft_chain_delete(nf_sock, nlc, 0); nft_chain_free(nlc); + if (err < 0) { + netlink_io_error(ctx, loc, "Could not delete chain: %s", + strerror(errno)); + } + return err; +} + +static int netlink_del_chain_batch(struct netlink_ctx *ctx, + const struct handle *h, + const struct location *loc) +{ + struct nft_chain *nlc; + int err; + + nlc = alloc_nft_chain(h); + netlink_dump_chain(nlc); + err = mnl_nft_chain_batch_del(nf_sock, nlc, 0); + nft_chain_free(nlc); + if (err < 0) netlink_io_error(ctx, loc, "Could not delete chain: %s", strerror(errno)); return err; } +int netlink_delete_chain(struct netlink_ctx *ctx, const struct handle *h, + const struct location *loc) +{ + int ret; + + if (ctx->batch_supported) + ret = netlink_del_chain_batch(ctx, h, loc); + else + ret = netlink_del_chain_compat(ctx, h, loc); + + return ret; +} + static int list_chain_cb(struct nft_chain *nlc, void *arg) { struct netlink_ctx *ctx = arg;