From mboxrd@z Thu Jan 1 00:00:00 1970 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=-10.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 D893EC0651F for ; Thu, 4 Jul 2019 23:49:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B0D4F216FD for ; Thu, 4 Jul 2019 23:49:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727669AbfGDXtQ (ORCPT ); Thu, 4 Jul 2019 19:49:16 -0400 Received: from mail.us.es ([193.147.175.20]:33004 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727654AbfGDXtP (ORCPT ); Thu, 4 Jul 2019 19:49:15 -0400 Received: from antivirus1-rhel7.int (unknown [192.168.2.11]) by mail.us.es (Postfix) with ESMTP id 7FD82819DD for ; Fri, 5 Jul 2019 01:49:13 +0200 (CEST) Received: from antivirus1-rhel7.int (localhost [127.0.0.1]) by antivirus1-rhel7.int (Postfix) with ESMTP id 654251150D8 for ; Fri, 5 Jul 2019 01:49:13 +0200 (CEST) Received: by antivirus1-rhel7.int (Postfix, from userid 99) id 6192D1150CC; Fri, 5 Jul 2019 01:49:13 +0200 (CEST) Received: from antivirus1-rhel7.int (localhost [127.0.0.1]) by antivirus1-rhel7.int (Postfix) with ESMTP id CF040DA704; Fri, 5 Jul 2019 01:49:10 +0200 (CEST) Received: from 192.168.1.97 (192.168.1.97) by antivirus1-rhel7.int (F-Secure/fsigk_smtp/550/antivirus1-rhel7.int); Fri, 05 Jul 2019 01:49:10 +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 9EC764265A31; Fri, 5 Jul 2019 01:49:09 +0200 (CEST) X-SMTPAUTHUS: auth mail.us.es From: Pablo Neira Ayuso To: netdev@vger.kernel.org Cc: netfilter-devel@vger.kernel.org, davem@davemloft.net, thomas.lendacky@amd.com, f.fainelli@gmail.com, ariel.elior@cavium.com, michael.chan@broadcom.com, madalin.bucur@nxp.com, yisen.zhuang@huawei.com, salil.mehta@huawei.com, jeffrey.t.kirsher@intel.com, tariqt@mellanox.com, saeedm@mellanox.com, jiri@mellanox.com, idosch@mellanox.com, jakub.kicinski@netronome.com, peppe.cavallaro@st.com, grygorii.strashko@ti.com, andrew@lunn.ch, vivien.didelot@gmail.com, alexandre.torgue@st.com, joabreu@synopsys.com, linux-net-drivers@solarflare.com, ogerlitz@mellanox.com, Manish.Chopra@cavium.com, marcelo.leitner@gmail.com, mkubecek@suse.cz, venkatkumar.duvvuru@broadcom.com, maxime.chevallier@bootlin.com, cphealy@gmail.com Subject: [PATCH 02/15 net-next,v2] net: sched: add tcf_block_cb_alloc() Date: Fri, 5 Jul 2019 01:48:30 +0200 Message-Id: <20190704234843.6601-3-pablo@netfilter.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190704234843.6601-1-pablo@netfilter.org> References: <20190704234843.6601-1-pablo@netfilter.org> X-Virus-Scanned: ClamAV using ClamSMTP Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add a new helper function to allocate tcf_block_cb objects. Signed-off-by: Pablo Neira Ayuso --- v2: return -EOPNOTSUPP if sched/cls_api is disabled, per Marcelo Ricardo Leitner . include/net/pkt_cls.h | 8 ++++++++ net/sched/cls_api.c | 27 +++++++++++++++++++++------ 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h index 1a7596ba0dbe..a756d895c7a4 100644 --- a/include/net/pkt_cls.h +++ b/include/net/pkt_cls.h @@ -72,6 +72,8 @@ static inline struct Qdisc *tcf_block_q(struct tcf_block *block) return block->q; } +struct tcf_block_cb *tcf_block_cb_alloc(tc_setup_cb_t *cb, + void *cb_ident, void *cb_priv); void *tcf_block_cb_priv(struct tcf_block_cb *block_cb); struct tcf_block_cb *tcf_block_cb_lookup(struct tcf_block *block, tc_setup_cb_t *cb, void *cb_ident); @@ -150,6 +152,12 @@ void tc_setup_cb_block_unregister(struct tcf_block *block, tc_setup_cb_t *cb, { } +static inline struct tcf_block_cb * +tcf_block_cb_alloc(tc_setup_cb_t *cb, void *cb_ident, void *cb_priv) +{ + return ERR_PTR(-EOPNOTSUPP); +} + static inline void *tcf_block_cb_priv(struct tcf_block_cb *block_cb) { diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c index b2417fda26ec..6cd76e3df2be 100644 --- a/net/sched/cls_api.c +++ b/net/sched/cls_api.c @@ -746,6 +746,23 @@ unsigned int tcf_block_cb_decref(struct tcf_block_cb *block_cb) } EXPORT_SYMBOL(tcf_block_cb_decref); +struct tcf_block_cb *tcf_block_cb_alloc(tc_setup_cb_t *cb, + void *cb_ident, void *cb_priv) +{ + struct tcf_block_cb *block_cb; + + block_cb = kzalloc(sizeof(*block_cb), GFP_KERNEL); + if (!block_cb) + return ERR_PTR(-ENOMEM); + + block_cb->cb = cb; + block_cb->cb_ident = cb_ident; + block_cb->cb_priv = cb_priv; + + return block_cb; +} +EXPORT_SYMBOL(tcf_block_cb_alloc); + struct tcf_block_cb *__tcf_block_cb_register(struct tcf_block *block, tc_setup_cb_t *cb, void *cb_ident, void *cb_priv, @@ -761,12 +778,10 @@ struct tcf_block_cb *__tcf_block_cb_register(struct tcf_block *block, if (err) return ERR_PTR(err); - block_cb = kzalloc(sizeof(*block_cb), GFP_KERNEL); - if (!block_cb) - return ERR_PTR(-ENOMEM); - block_cb->cb = cb; - block_cb->cb_ident = cb_ident; - block_cb->cb_priv = cb_priv; + block_cb = tcf_block_cb_alloc(cb, cb_ident, cb_priv); + if (IS_ERR(block_cb)) + return block_cb; + list_add(&block_cb->list, &block->cb_list); return block_cb; } -- 2.11.0