Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1EE20C04E87 for ; Mon, 20 May 2019 12:27:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F242A21019 for ; Mon, 20 May 2019 12:27:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389390AbfETM1A (ORCPT ); Mon, 20 May 2019 08:27:00 -0400 Received: from mail.us.es ([193.147.175.20]:34226 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389432AbfETM07 (ORCPT ); Mon, 20 May 2019 08:26:59 -0400 Received: from antivirus1-rhel7.int (unknown [192.168.2.11]) by mail.us.es (Postfix) with ESMTP id 647201D94A6 for ; Mon, 20 May 2019 14:26:56 +0200 (CEST) Received: from antivirus1-rhel7.int (localhost [127.0.0.1]) by antivirus1-rhel7.int (Postfix) with ESMTP id 53C29DA710 for ; Mon, 20 May 2019 14:26:56 +0200 (CEST) Received: by antivirus1-rhel7.int (Postfix, from userid 99) id 49777DA705; Mon, 20 May 2019 14:26:56 +0200 (CEST) Received: from antivirus1-rhel7.int (localhost [127.0.0.1]) by antivirus1-rhel7.int (Postfix) with ESMTP id 4B29CDA706; Mon, 20 May 2019 14:26:54 +0200 (CEST) Received: from 192.168.1.97 (192.168.1.97) by antivirus1-rhel7.int (F-Secure/fsigk_smtp/550/antivirus1-rhel7.int); Mon, 20 May 2019 14:26:54 +0200 (CEST) X-Virus-Status: clean(F-Secure/fsigk_smtp/550/antivirus1-rhel7.int) Received: from salvia.here (sys.soleta.eu [212.170.55.40]) (Authenticated sender: pneira@us.es) by entrada.int (Postfix) with ESMTPA id 1F42D4265A32; Mon, 20 May 2019 14:26:54 +0200 (CEST) X-SMTPAUTHUS: auth mail.us.es From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Cc: phil@nwl.cc, fw@strlen.de Subject: [PATCH iptables 4/6] nft: add flush_cache() Date: Mon, 20 May 2019 14:26:44 +0200 Message-Id: <20190520122646.17788-5-pablo@netfilter.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190520122646.17788-1-pablo@netfilter.org> References: <20190520122646.17788-1-pablo@netfilter.org> X-Virus-Scanned: ClamAV using ClamSMTP Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org This new function takes a struct nft_cache as parameter. This patch also introduces __nft_table_builtin_find() which is required to look up for built-in tables without the nft_handle structure. Signed-off-by: Pablo Neira Ayuso --- iptables/nft.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/iptables/nft.c b/iptables/nft.c index b0a15e9b3f7c..8f6f7a41ff33 100644 --- a/iptables/nft.c +++ b/iptables/nft.c @@ -840,31 +840,39 @@ static int __flush_chain_cache(struct nftnl_chain *c, void *data) return 0; } -static void flush_chain_cache(struct nft_handle *h, const char *tablename) +static int flush_cache(struct nft_cache *c, const struct builtin_table *tables, + const char *tablename) { const struct builtin_table *table; int i; if (tablename) { - table = nft_table_builtin_find(h, tablename); - if (!table || !h->cache->table[table->type].chains) - return; - nftnl_chain_list_foreach(h->cache->table[table->type].chains, + table = __nft_table_builtin_find(tables, tablename); + if (!table || !c->table[table->type].chains) + return 0; + nftnl_chain_list_foreach(c->table[table->type].chains, __flush_chain_cache, NULL); - return; + return 0; } for (i = 0; i < NFT_TABLE_MAX; i++) { - if (h->tables[i].name == NULL) + if (tables[i].name == NULL) continue; - if (!h->cache->table[i].chains) + if (!c->table[i].chains) continue; - nftnl_chain_list_free(h->cache->table[i].chains); - h->cache->table[i].chains = NULL; + nftnl_chain_list_free(c->table[i].chains); + c->table[i].chains = NULL; } - h->have_cache = false; + + return 1; +} + +static void flush_chain_cache(struct nft_handle *h, const char *tablename) +{ + if (flush_cache(h->cache, h->tables, tablename)) + h->have_cache = false; } void nft_fini(struct nft_handle *h) -- 2.11.0