{"id":831012,"url":"http://patchwork.ozlabs.org/api/1.2/patches/831012/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20171027012443.3306-5-xiyou.wangcong@gmail.com/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.2/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20171027012443.3306-5-xiyou.wangcong@gmail.com>","list_archive_url":null,"date":"2017-10-27T01:24:31","name":"[net,04/16] net_sched: use tcf_queue_work() in cgroup filter","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"795389670816e1e16177d9d0c8bfbc4a4b4dd7ce","submitter":{"id":211,"url":"http://patchwork.ozlabs.org/api/1.2/people/211/?format=json","name":"Cong Wang","email":"xiyou.wangcong@gmail.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.2/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20171027012443.3306-5-xiyou.wangcong@gmail.com/mbox/","series":[{"id":10472,"url":"http://patchwork.ozlabs.org/api/1.2/series/10472/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=10472","date":"2017-10-27T01:24:27","name":"net_sched: fix races with RCU callbacks","version":1,"mbox":"http://patchwork.ozlabs.org/series/10472/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/831012/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/831012/checks/","tags":{},"related":[],"headers":{"Return-Path":"<netdev-owner@vger.kernel.org>","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=<UNKNOWN>)","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"bUT+WZtO\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3yNR526m0Jz9t2x\n\tfor <patchwork-incoming@ozlabs.org>;\n\tFri, 27 Oct 2017 12:25:10 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S932375AbdJ0BZJ (ORCPT <rfc822;patchwork-incoming@ozlabs.org>);\n\tThu, 26 Oct 2017 21:25:09 -0400","from mail-pf0-f195.google.com ([209.85.192.195]:45018 \"EHLO\n\tmail-pf0-f195.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751961AbdJ0BZD (ORCPT\n\t<rfc822;netdev@vger.kernel.org>); Thu, 26 Oct 2017 21:25:03 -0400","by mail-pf0-f195.google.com with SMTP id x7so3784151pfa.1\n\tfor <netdev@vger.kernel.org>; Thu, 26 Oct 2017 18:25:03 -0700 (PDT)","from tw-172-25-30-113.office.twttr.net ([8.25.197.25])\n\tby smtp.gmail.com with ESMTPSA id\n\tb16sm13211973pfe.58.2017.10.26.18.25.01\n\t(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);\n\tThu, 26 Oct 2017 18:25:01 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=gmail.com; s=20161025;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=NjEubXu1r0K79UfRTpn5RPS+x24LrUQyKVHjxUumWwE=;\n\tb=bUT+WZtOh0/vpuvGUIkxQn3t7tSiiofGHCbPiIX9za3u1+s/hfINiebZq+N9a5yKjT\n\tVP5uXaj3fybsAYzfsUKiRe6z04SsxeGQH3q0+8Z91J3fYdqMuHueTX/kCBQrbnXg/4Pj\n\tuIsG/gXJv6ulAquZAV7tM7qN83hwh0ZOUkzNaudNLBFT9UxRHDn6vXMinwkxFhrPB+FT\n\tex6Y4uW2LE+ci8dLySZeWIT2j1Aktg6lGkab2qafUd+4sUT20QXuC2N9ojoIN/R7mNy6\n\tNz6HZ1B/cfym/dzHdrHWufKN6XLwmc0VnygoLVrsg4dGAGUKBpt6sI+ytDx6FDBcEKWp\n\t7n9Q==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=NjEubXu1r0K79UfRTpn5RPS+x24LrUQyKVHjxUumWwE=;\n\tb=J+13GRDItWsDUJPb4gPB852h1Zfmvj4Y9rs7Xyxrrht6qehTaiFoEJ5fHOneCj5813\n\tE1TwuUnKbEclXROAo3fHZxKZo/3vGnr7jGw0nou6YFXO3jaE+iE8rLOj3B7RuHapJAls\n\tZG32KutdoMwe73FLaHsTIMhWhxq+JO4WFmp4r3fN29zeJM89INaGCoSnLCK5jM57JHnM\n\tH7MNMzm1iN9GkCo6Hu6h7UOMG0mHnVv63phXAwI2iWb6aisYYs0Vn0vQWo9oKQUxq0vq\n\tdgDGNBuiy4Ae6I0ACu3abdB43XwVCVu9CIhLP7OQH1jO6GT+WPonoZrPOmD4xFm2lTsU\n\tkFlg==","X-Gm-Message-State":"AMCzsaUufq2f3d0xPf8yDPB0bD33vBettTKBMsHH6tdBcsVg/XVSz6Bo\n\tbANU01xv9x0Ake7SA+CTQsgcjGkg","X-Google-Smtp-Source":"ABhQp+SNNoGxbo/U0qZ565xsrqz+GWaEK14weVBPBAfgXCipLpFonVZ48NhU0Yddm8zl9Q9rncS0Gw==","X-Received":"by 10.84.244.136 with SMTP id h8mr5795658pll.84.1509067502529;\n\tThu, 26 Oct 2017 18:25:02 -0700 (PDT)","From":"Cong Wang <xiyou.wangcong@gmail.com>","To":"netdev@vger.kernel.org","Cc":"Chris Mi <chrism@mellanox.com>, Cong Wang <xiyou.wangcong@gmail.com>,\n\tDaniel Borkmann <daniel@iogearbox.net>, Jiri Pirko <jiri@resnulli.us>,\n\tJohn Fastabend <john.fastabend@gmail.com>,\n\tJamal Hadi Salim <jhs@mojatatu.com>,\n\t\"Paul E. McKenney\" <paulmck@linux.vnet.ibm.com>","Subject":"[Patch net 04/16] net_sched: use tcf_queue_work() in cgroup filter","Date":"Thu, 26 Oct 2017 18:24:31 -0700","Message-Id":"<20171027012443.3306-5-xiyou.wangcong@gmail.com>","X-Mailer":"git-send-email 2.9.4","In-Reply-To":"<20171027012443.3306-1-xiyou.wangcong@gmail.com>","References":"<20171027012443.3306-1-xiyou.wangcong@gmail.com>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"<netdev.vger.kernel.org>","X-Mailing-List":"netdev@vger.kernel.org"},"content":"Defer the tcf_exts_destroy() in RCU callback to\ntc filter workqueue and get RTNL lock.\n\nReported-by: Chris Mi <chrism@mellanox.com>\nCc: Daniel Borkmann <daniel@iogearbox.net>\nCc: Jiri Pirko <jiri@resnulli.us>\nCc: John Fastabend <john.fastabend@gmail.com>\nCc: Jamal Hadi Salim <jhs@mojatatu.com>\nCc: \"Paul E. McKenney\" <paulmck@linux.vnet.ibm.com>\nSigned-off-by: Cong Wang <xiyou.wangcong@gmail.com>\n---\n net/sched/cls_cgroup.c | 22 ++++++++++++++++++----\n 1 file changed, 18 insertions(+), 4 deletions(-)","diff":"diff --git a/net/sched/cls_cgroup.c b/net/sched/cls_cgroup.c\nindex d48452f87975..a97e069bee89 100644\n--- a/net/sched/cls_cgroup.c\n+++ b/net/sched/cls_cgroup.c\n@@ -23,7 +23,10 @@ struct cls_cgroup_head {\n \tstruct tcf_exts\t\texts;\n \tstruct tcf_ematch_tree\tematches;\n \tstruct tcf_proto\t*tp;\n-\tstruct rcu_head\t\trcu;\n+\tunion {\n+\t\tstruct work_struct\twork;\n+\t\tstruct rcu_head\t\trcu;\n+\t};\n };\n \n static int cls_cgroup_classify(struct sk_buff *skb, const struct tcf_proto *tp,\n@@ -57,15 +60,26 @@ static const struct nla_policy cgroup_policy[TCA_CGROUP_MAX + 1] = {\n \t[TCA_CGROUP_EMATCHES]\t= { .type = NLA_NESTED },\n };\n \n+static void cls_cgroup_destroy_work(struct work_struct *work)\n+{\n+\tstruct cls_cgroup_head *head = container_of(work,\n+\t\t\t\t\t\t    struct cls_cgroup_head,\n+\t\t\t\t\t\t    work);\n+\trtnl_lock();\n+\ttcf_exts_destroy(&head->exts);\n+\ttcf_em_tree_destroy(&head->ematches);\n+\tkfree(head);\n+\trtnl_unlock();\n+}\n+\n static void cls_cgroup_destroy_rcu(struct rcu_head *root)\n {\n \tstruct cls_cgroup_head *head = container_of(root,\n \t\t\t\t\t\t    struct cls_cgroup_head,\n \t\t\t\t\t\t    rcu);\n \n-\ttcf_exts_destroy(&head->exts);\n-\ttcf_em_tree_destroy(&head->ematches);\n-\tkfree(head);\n+\tINIT_WORK(&head->work, cls_cgroup_destroy_work);\n+\ttcf_queue_work(&head->work);\n }\n \n static int cls_cgroup_change(struct net *net, struct sk_buff *in_skb,\n","prefixes":["net","04/16"]}