From patchwork Thu Oct 12 17:17:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 824982 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=resnulli-us.20150623.gappssmtp.com header.i=@resnulli-us.20150623.gappssmtp.com header.b="Ure1EyZp"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yCd1b1Gkzz9sNw for ; Fri, 13 Oct 2017 04:21:39 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756779AbdJLRVZ (ORCPT ); Thu, 12 Oct 2017 13:21:25 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:51962 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753416AbdJLRSf (ORCPT ); Thu, 12 Oct 2017 13:18:35 -0400 Received: by mail-wm0-f65.google.com with SMTP id f4so15295606wme.0 for ; Thu, 12 Oct 2017 10:18:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=f56iYLGLNUpIjrdk65XgfpltjQgLMbGhkbWdRWNaPA4=; b=Ure1EyZpw6c2qYx75IL3t8IiOg2gT/e/L4uCZhVFCEM9fUvym1qgYhPgsRmIIFXoN3 DslXIwL9wfFzSQJz6itbQYWQHEp2pjORKmCc2UJBOwhZf6bOWwYdCSXcfIK+yFERI+z+ vMb2isw9yuj123vh5LfJ/4TvA5Aqt4Rb0aygiIDwIAQR44dqIz8IU6eK0BzKym/yr/0r AIXQiPVAfu0+5O/MkcRPg4TlRAggK1ZvA8ha8dqczMEVvowneX62anz8GSWtm8IQNU8z dVZLxYIh3mzYkjaTfHb1VuqxqtmBQcnB0RmGIGfXGmAUCpAkK27TTewY5e5gHSh3QRjo pr1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=f56iYLGLNUpIjrdk65XgfpltjQgLMbGhkbWdRWNaPA4=; b=NwwERgeup0xVLYRqLkoYJR1vTKSjP4B+V8GSe53hTsvHGA65Ci28dcjLGqkIaMugSc KQPIrNI5no5z4cHVD2cE1dcmkiALkpy9Zj5Q6sSXFpd/KAlweCPbZ78vLrzpdHRh+ito 5AGpXrI+6NYFsWbUKE8FutsclC0wZKbRbm4sUUMyF6FKXp/BrygxxKMt5NiR7xQ1UF5j 4fqt9o4R713t16PflPNDoAohz6DOB3B6UC5DWyyfJLkn6nHebazOOP3tMGtPU6Z6Fru7 tMd1BGEBvXO/rwXjin+74HW/Q54nJ6+DCm8aRFSbL5bTXqKGt1HQPZwNC6ZhYojdt5NE 1ISw== X-Gm-Message-State: AMCzsaU+tNrOrd1x7mLadoRCkfloZ8iSBtw1inTAdddb1ttCCIKJUgVl bTagvKEoB1nnNX/EDMf3nCvFf8vi X-Google-Smtp-Source: AOwi7QC2Tr7xICD5b73zAtAyq3e9ZRMstywO4wjQg219r4ricv1crw0xdauL8ZWAXZuYONPi0IBS8Q== X-Received: by 10.28.149.204 with SMTP id x195mr2568815wmd.78.1507828713581; Thu, 12 Oct 2017 10:18:33 -0700 (PDT) Received: from localhost (ip-89-177-136-69.net.upcbroadband.cz. [89.177.136.69]) by smtp.gmail.com with ESMTPSA id l19sm14212243wre.26.2017.10.12.10.18.33 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 12 Oct 2017 10:18:33 -0700 (PDT) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, jhs@mojatatu.com, xiyou.wangcong@gmail.com, mlxsw@mellanox.com, andrew@lunn.ch, vivien.didelot@savoirfairelinux.com, f.fainelli@gmail.com, michael.chan@broadcom.com, ganeshgr@chelsio.com, jeffrey.t.kirsher@intel.com, saeedm@mellanox.com, matanb@mellanox.com, leonro@mellanox.com, idosch@mellanox.com, jakub.kicinski@netronome.com, ast@kernel.org, daniel@iogearbox.net, simon.horman@netronome.com, pieter.jansenvanvuuren@netronome.com, john.hurley@netronome.com, edumazet@google.com, dsahern@gmail.com, alexander.h.duyck@intel.com, john.fastabend@gmail.com, willemb@google.com Subject: [patch net-next 10/34] net: sched: use tcf_block_q helper to get q pointer for sch_tree_lock Date: Thu, 12 Oct 2017 19:17:59 +0200 Message-Id: <20171012171823.1431-11-jiri@resnulli.us> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20171012171823.1431-1-jiri@resnulli.us> References: <20171012171823.1431-1-jiri@resnulli.us> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jiri Pirko Use tcf_block_q helper to get q pointer to be used for direct call of sch_tree_lock/unlock instead of tcf_tree_lock/unlock. Signed-off-by: Jiri Pirko --- include/net/sch_generic.h | 3 --- net/sched/sch_api.c | 6 ++++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index 0b2ba3b..a4926c9 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h @@ -361,9 +361,6 @@ static inline void sch_tree_unlock(const struct Qdisc *q) spin_unlock_bh(qdisc_root_sleeping_lock(q)); } -#define tcf_tree_lock(tp) sch_tree_lock((tp)->q) -#define tcf_tree_unlock(tp) sch_tree_unlock((tp)->q) - extern struct Qdisc noop_qdisc; extern struct Qdisc_ops noop_qdisc_ops; extern struct Qdisc_ops pfifo_fast_ops; diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c index aa82116..a9ac912 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c @@ -1661,9 +1661,11 @@ static int tcf_node_bind(struct tcf_proto *tp, void *n, struct tcf_walker *arg) struct tcf_bind_args *a = (void *)arg; if (tp->ops->bind_class) { - tcf_tree_lock(tp); + struct Qdisc *q = tcf_block_q(tp->chain->block); + + sch_tree_lock(q); tp->ops->bind_class(n, a->classid, a->cl); - tcf_tree_unlock(tp); + sch_tree_unlock(q); } return 0; }