From patchwork Mon Oct 23 22:02:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cong Wang X-Patchwork-Id: 829706 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=gmail.com header.i=@gmail.com header.b="sIO8vpLA"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yLVlw44Rdz9sPt for ; Tue, 24 Oct 2017 09:03:40 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751299AbdJWWDh (ORCPT ); Mon, 23 Oct 2017 18:03:37 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:53294 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751113AbdJWWDe (ORCPT ); Mon, 23 Oct 2017 18:03:34 -0400 Received: by mail-pf0-f196.google.com with SMTP id t188so18110300pfd.10 for ; Mon, 23 Oct 2017 15:03:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=FKzc3t2ZT1K079lFD3cPhT+IPUot2RFpbd7qFsrwtYU=; b=sIO8vpLAICRj2LZiyWAm22+bViK36jTmnopUuR+A5qWOdmn0SXaGt4mQ+zwNTwy5Zd 4IOVU48O/IAhqmqcNVC7LbCVRUrued/eXCWjyNa114NbZj33IfmQnc1dAIlS0w5fNzFs TUIAXKSBnq3N/f1gIxamcLWUe6uUStHbPaoR57+vBisJsy7bL3zzo4A0ydBqw4mzTBmn 7KAqUT12UWenER9K3lsQDkVsVaraTi8MGueYOoEK6+CamNUjEpv00B7zc7efA48AGMBj 9rxFFA+VZLIzV/7/4QTU5vSY1Wr7TpPzoyo9Y2WSsIwsoSUbT4YhA/Pk6Ri7p9TMBY9h D/6Q== 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=FKzc3t2ZT1K079lFD3cPhT+IPUot2RFpbd7qFsrwtYU=; b=AuuU5EJ9h8RZ6hkDF2qy3KuWv+Ei1u4khKU/HA/lZN2nrdSTWaSSEgG7TN7L5JLdkR DfKY7RWqPKiXiCJc8pQUwwPL4zf+Hpip3MCkWKxSsNfX2jjib9nKy4vuNYDFFivOo3ll 5yj8I7pC8mHlvGxYC5FS2PDyGDE9SgFZK8aSAqeJiyU+iKkJ0gYrNpvXgykoxpbxWsZI alnOcCvDjIpx9dkc2ZKkCKtkHLHYdOK+pqbKmj5QrS3UVpYRXzAhgSDLNdGbkwoT/gSp HRw3za5O0PyBRkFXXQcqIxTqaFM1fB9RjU5ca5DbmjbKT/DsWMVoNAOWsFGIzgscU8Dx PqlA== X-Gm-Message-State: AMCzsaXHIYKnW6S6FRtk1B775H+VqP3C1nr/ASD6qeGjsP/xBDFd/0nx htvGkqRS07fjiB8bRqRvxJMtydL5 X-Google-Smtp-Source: ABhQp+S/yicdA4MkzW5pRCRQLosPsGc3TTjqos8J5upTqXOheeGkSzj37HdQCqQDnHvO30zYWjGm5Q== X-Received: by 10.98.105.199 with SMTP id e190mr14436682pfc.275.1508796212772; Mon, 23 Oct 2017 15:03:32 -0700 (PDT) Received: from tw-172-25-30-113.office.twttr.net ([8.25.197.25]) by smtp.gmail.com with ESMTPSA id n72sm15285926pfg.109.2017.10.23.15.03.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 23 Oct 2017 15:03:31 -0700 (PDT) From: Cong Wang To: netdev@vger.kernel.org Cc: paulmck@linux.vnet.ibm.com, jhs@mojatatu.com, john.fastabend@gmail.com, Chris Mi , Cong Wang , Daniel Borkmann Subject: [Patch net 01/15] net_sched: remove RCU callbacks in basic filter Date: Mon, 23 Oct 2017 15:02:50 -0700 Message-Id: <20171023220304.2268-2-xiyou.wangcong@gmail.com> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20171023220304.2268-1-xiyou.wangcong@gmail.com> References: <20171023220304.2268-1-xiyou.wangcong@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Replace call_rcu() with synchronize_rcu(), except in basic_destroy() we have to use list_splice_init_rcu(). Reported-by: Chris Mi Cc: Daniel Borkmann Cc: John Fastabend Cc: Jamal Hadi Salim Cc: "Paul E. McKenney" Signed-off-by: Cong Wang --- net/sched/cls_basic.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/net/sched/cls_basic.c b/net/sched/cls_basic.c index d89ebafd2239..11bca8346e0f 100644 --- a/net/sched/cls_basic.c +++ b/net/sched/cls_basic.c @@ -24,7 +24,6 @@ struct basic_head { u32 hgenerator; struct list_head flist; - struct rcu_head rcu; }; struct basic_filter { @@ -34,7 +33,6 @@ struct basic_filter { struct tcf_result res; struct tcf_proto *tp; struct list_head link; - struct rcu_head rcu; }; static int basic_classify(struct sk_buff *skb, const struct tcf_proto *tp, @@ -82,10 +80,8 @@ static int basic_init(struct tcf_proto *tp) return 0; } -static void basic_delete_filter(struct rcu_head *head) +static void basic_delete_filter(struct basic_filter *f) { - struct basic_filter *f = container_of(head, struct basic_filter, rcu); - tcf_exts_destroy(&f->exts); tcf_em_tree_destroy(&f->ematches); kfree(f); @@ -95,13 +91,16 @@ static void basic_destroy(struct tcf_proto *tp) { struct basic_head *head = rtnl_dereference(tp->root); struct basic_filter *f, *n; + LIST_HEAD(local); + + list_splice_init_rcu(&head->flist, &local, synchronize_rcu); - list_for_each_entry_safe(f, n, &head->flist, link) { - list_del_rcu(&f->link); + list_for_each_entry_safe(f, n, &local, link) { + list_del(&f->link); tcf_unbind_filter(tp, &f->res); - call_rcu(&f->rcu, basic_delete_filter); + basic_delete_filter(f); } - kfree_rcu(head, rcu); + kfree(head); } static int basic_delete(struct tcf_proto *tp, void *arg, bool *last) @@ -111,7 +110,8 @@ static int basic_delete(struct tcf_proto *tp, void *arg, bool *last) list_del_rcu(&f->link); tcf_unbind_filter(tp, &f->res); - call_rcu(&f->rcu, basic_delete_filter); + synchronize_rcu(); + basic_delete_filter(f); *last = list_empty(&head->flist); return 0; } @@ -205,7 +205,8 @@ static int basic_change(struct net *net, struct sk_buff *in_skb, if (fold) { list_replace_rcu(&fold->link, &fnew->link); tcf_unbind_filter(tp, &fold->res); - call_rcu(&fold->rcu, basic_delete_filter); + synchronize_rcu(); + basic_delete_filter(fold); } else { list_add_rcu(&fnew->link, &head->flist); }