{"id":831016,"url":"http://patchwork.ozlabs.org/api/1.2/patches/831016/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20171027012443.3306-10-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-10-xiyou.wangcong@gmail.com>","list_archive_url":null,"date":"2017-10-27T01:24:36","name":"[net,09/16] net_sched: use tcf_queue_work() in u32 filter","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"74b125e250bf70e205db0b5712e2078710ba59cf","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-10-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/831016/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/831016/checks/","tags":{},"related":[],"headers":{"Return-Path":"","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=)","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"mPe/71tD\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3yNR5L0Jm3z9t2h\n\tfor ;\n\tFri, 27 Oct 2017 12:25:26 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S932459AbdJ0BZX (ORCPT );\n\tThu, 26 Oct 2017 21:25:23 -0400","from mail-pg0-f66.google.com ([74.125.83.66]:50277 \"EHLO\n\tmail-pg0-f66.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S932345AbdJ0BZJ (ORCPT\n\t); Thu, 26 Oct 2017 21:25:09 -0400","by mail-pg0-f66.google.com with SMTP id y5so4055300pgq.7\n\tfor ; Thu, 26 Oct 2017 18:25:09 -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.07\n\t(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);\n\tThu, 26 Oct 2017 18:25:07 -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=vkTnaxp2cEzgmO2qCpUxirWCj7pw++LvvF+LpBU/EY4=;\n\tb=mPe/71tDNk05g/nMrVcDLpEtC1kV0+qupUwuExT7f0wqV1Ec877r9CGydJWr/FiQNa\n\tXqFTyCMmk51tHxBeX+hmYzZRZlKkKHizzSOmAozSJUY/Dn0phnHXDg4LL1PUN9BHkEZE\n\tjHPNq2rrBDy3Mk8ybDnB7h+4xAgUqbtgoiifVo4Su+WsS4mrfuLtsgZbtLknU7GgZac6\n\tKm0TYpDKyYQ9z46xWzzMfCLv4pSYPpju1/i2NCbwieTOy3X62JS5Q27llhczQ7OD95MX\n\t8bi7r5uCuI/CRj5QJ/BsMeu28Jqou/VtcOHiOlNqcWwCebnR5hBusvfx4WfqlUyJdTjb\n\tV1Kg==","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=vkTnaxp2cEzgmO2qCpUxirWCj7pw++LvvF+LpBU/EY4=;\n\tb=YpaZGrLotBOI5a6fu1FDXNBXv5P55mjUiWWA1XTl3w6gsdMy9aWQR7PDaXXtljrNNp\n\toRTOpAbp9mfTYPs2jxHrWmv1TuGaF0LRls/N8AYt88zTAYL+sUi/kfMDWKKcPGu4MoF6\n\tmLFLRGYlJh4z8Br0Owd0usfdY495njXTFznr5RGlanX1Rp0evfkD+EvIY8NjgubIGR8O\n\tVeIm7bLQQmUZ19mn8nG+wHWL7K4EX4kzTwgMh5fXEmhau1odZHDVcFLcxkUxvDP1qGlu\n\tsrB1GscPOSGGycaMUd4JyfIb5xksYX/E6+MXYFV2g9q2EslpiI2oYskvbZMPoE3nRoxz\n\tFRxQ==","X-Gm-Message-State":"AMCzsaV11O9bzZLe5QLcRDT0uWF/JZ/+9W8qEBxVdouAiA+kde2pJUbq\n\totdMa5Jn3c18mNgdRD+573ZAK351","X-Google-Smtp-Source":"ABhQp+TL+YX6He16Ci8Y5Cj85knQyOpH+0RZEDyno//OPW+rl+FgVwjNyN8gvTjcw+SND+OY+dty+A==","X-Received":"by 10.99.52.194 with SMTP id b185mr6464145pga.170.1509067508535; \n\tThu, 26 Oct 2017 18:25:08 -0700 (PDT)","From":"Cong Wang ","To":"netdev@vger.kernel.org","Cc":"Chris Mi , Cong Wang ,\n\tDaniel Borkmann , Jiri Pirko ,\n\tJohn Fastabend ,\n\tJamal Hadi Salim ,\n\t\"Paul E. McKenney\" ","Subject":"[Patch net 09/16] net_sched: use tcf_queue_work() in u32 filter","Date":"Thu, 26 Oct 2017 18:24:36 -0700","Message-Id":"<20171027012443.3306-10-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":"","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 \nCc: Daniel Borkmann \nCc: Jiri Pirko \nCc: John Fastabend \nCc: Jamal Hadi Salim \nCc: \"Paul E. McKenney\" \nSigned-off-by: Cong Wang \n---\n net/sched/cls_u32.c | 29 ++++++++++++++++++++++++++---\n 1 file changed, 26 insertions(+), 3 deletions(-)","diff":"diff --git a/net/sched/cls_u32.c b/net/sched/cls_u32.c\nindex 10b8d851fc6b..dadd1b344497 100644\n--- a/net/sched/cls_u32.c\n+++ b/net/sched/cls_u32.c\n@@ -68,7 +68,10 @@ struct tc_u_knode {\n \tu32 __percpu\t\t*pcpu_success;\n #endif\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 \t/* The 'sel' field MUST be the last field in structure to allow for\n \t * tc_u32_keys allocated at end of structure.\n \t */\n@@ -418,11 +421,21 @@ static int u32_destroy_key(struct tcf_proto *tp, struct tc_u_knode *n,\n * this the u32_delete_key_rcu variant does not free the percpu\n * statistics.\n */\n+static void u32_delete_key_work(struct work_struct *work)\n+{\n+\tstruct tc_u_knode *key = container_of(work, struct tc_u_knode, work);\n+\n+\trtnl_lock();\n+\tu32_destroy_key(key->tp, key, false);\n+\trtnl_unlock();\n+}\n+\n static void u32_delete_key_rcu(struct rcu_head *rcu)\n {\n \tstruct tc_u_knode *key = container_of(rcu, struct tc_u_knode, rcu);\n \n-\tu32_destroy_key(key->tp, key, false);\n+\tINIT_WORK(&key->work, u32_delete_key_work);\n+\ttcf_queue_work(&key->work);\n }\n \n /* u32_delete_key_freepf_rcu is the rcu callback variant\n@@ -432,11 +445,21 @@ static void u32_delete_key_rcu(struct rcu_head *rcu)\n * for the variant that should be used with keys return from\n * u32_init_knode()\n */\n+static void u32_delete_key_freepf_work(struct work_struct *work)\n+{\n+\tstruct tc_u_knode *key = container_of(work, struct tc_u_knode, work);\n+\n+\trtnl_lock();\n+\tu32_destroy_key(key->tp, key, true);\n+\trtnl_unlock();\n+}\n+\n static void u32_delete_key_freepf_rcu(struct rcu_head *rcu)\n {\n \tstruct tc_u_knode *key = container_of(rcu, struct tc_u_knode, rcu);\n \n-\tu32_destroy_key(key->tp, key, true);\n+\tINIT_WORK(&key->work, u32_delete_key_freepf_work);\n+\ttcf_queue_work(&key->work);\n }\n \n static int u32_delete_key(struct tcf_proto *tp, struct tc_u_knode *key)\n","prefixes":["net","09/16"]}