{"id":806125,"url":"http://patchwork.ozlabs.org/api/patches/806125/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/1503759538-32890-1-git-send-email-gfree.wind@vip.163.com/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/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":"<1503759538-32890-1-git-send-email-gfree.wind@vip.163.com>","list_archive_url":null,"date":"2017-08-26T14:58:58","name":"[net-next,v2] sched: sfq: drop packets after root qdisc lock is released","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"efda8a532fd70e407ca93f1df143bae688153741","submitter":{"id":71538,"url":"http://patchwork.ozlabs.org/api/people/71538/?format=json","name":"Gao Feng","email":"gfree.wind@vip.163.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/1503759538-32890-1-git-send-email-gfree.wind@vip.163.com/mbox/","series":[],"comments":"http://patchwork.ozlabs.org/api/patches/806125/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/806125/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=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xfh9M5SGBz9t5X\n\tfor ;\n\tSun, 27 Aug 2017 01:03:03 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1754279AbdHZPCd (ORCPT );\n\tSat, 26 Aug 2017 11:02:33 -0400","from m181-177.vip.163.com ([123.58.177.181]:44824 \"EHLO\n\tm181-177.vip.163.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1752322AbdHZPCc (ORCPT\n\t); Sat, 26 Aug 2017 11:02:32 -0400","from ikuai8.com (unknown [114.248.156.71])\n\tby smtp2 (Coremail) with SMTP id oWZ4CgCXIlyyjKFZnxVBKQ--.8880S2;\n\tSat, 26 Aug 2017 22:59:05 +0800 (CST)"],"From":"gfree.wind@vip.163.com","To":"jhs@mojatatu.com, xiyou.wangcong@gmail.com, jiri@resnulli.us,\n\tdavem@davemloft.net, edumazet@google.com, netdev@vger.kernel.org","Cc":"Gao Feng ","Subject":"[PATCH net-next v2] sched: sfq: drop packets after root qdisc lock\n\tis released","Date":"Sat, 26 Aug 2017 22:58:58 +0800","Message-Id":"<1503759538-32890-1-git-send-email-gfree.wind@vip.163.com>","X-Mailer":"git-send-email 1.9.1","X-CM-TRANSID":"oWZ4CgCXIlyyjKFZnxVBKQ--.8880S2","X-Coremail-Antispam":"1Uf129KBjvJXoWxGFWfuw1UAw1xCF47Gw48WFg_yoW5GrW7pF\n\tZavwsxWr48Kr1xG3sYyw4xXa4ayr4Sy3sxWF1Y93yftFn8tryFqFy8WryYkr43Crn5Ca17\n\tZrn09ryfGr47CF7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2\n\t9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jjQ6LUUUUU=","X-Originating-IP":"[114.248.156.71]","X-CM-SenderInfo":"5jiuvvgozl0vg6yl1hqrwthudrp/1tbiJxlAs1XmwUs9gQAAsI","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"From: Gao Feng \n\nThe commit 520ac30f4551 (\"net_sched: drop packets after root qdisc lock\nis released) made a big change of tc for performance. But there are\nsome points which are not changed in SFQ enqueue operation.\n1. Fail to find the SFQ hash slot;\n2. When the queue is full;\n\nNow use qdisc_drop instead free skb directly.\n\nSigned-off-by: Gao Feng \n---\n v2: Add the to_free in the sfq_change, per Eric\n v1: initial version\n\n net/sched/sch_sfq.c | 20 +++++++++++++-------\n 1 file changed, 13 insertions(+), 7 deletions(-)","diff":"diff --git a/net/sched/sch_sfq.c b/net/sched/sch_sfq.c\nindex 82469ef..1896a8c 100644\n--- a/net/sched/sch_sfq.c\n+++ b/net/sched/sch_sfq.c\n@@ -292,7 +292,7 @@ static inline void slot_queue_add(struct sfq_slot *slot, struct sk_buff *skb)\n \tslot->skblist_prev = skb;\n }\n \n-static unsigned int sfq_drop(struct Qdisc *sch)\n+static unsigned int sfq_drop(struct Qdisc *sch, struct sk_buff **to_free)\n {\n \tstruct sfq_sched_data *q = qdisc_priv(sch);\n \tsfq_index x, d = q->cur_depth;\n@@ -310,9 +310,8 @@ static unsigned int sfq_drop(struct Qdisc *sch)\n \t\tslot->backlog -= len;\n \t\tsfq_dec(q, x);\n \t\tsch->q.qlen--;\n-\t\tqdisc_qstats_drop(sch);\n \t\tqdisc_qstats_backlog_dec(sch, skb);\n-\t\tkfree_skb(skb);\n+\t\tqdisc_drop(skb, sch, to_free);\n \t\treturn len;\n \t}\n \n@@ -360,7 +359,7 @@ static int sfq_headdrop(const struct sfq_sched_data *q)\n \tif (hash == 0) {\n \t\tif (ret & __NET_XMIT_BYPASS)\n \t\t\tqdisc_qstats_drop(sch);\n-\t\tkfree_skb(skb);\n+\t\t__qdisc_drop(skb, to_free);\n \t\treturn ret;\n \t}\n \thash--;\n@@ -465,7 +464,7 @@ static int sfq_headdrop(const struct sfq_sched_data *q)\n \t\treturn NET_XMIT_SUCCESS;\n \n \tqlen = slot->qlen;\n-\tdropped = sfq_drop(sch);\n+\tdropped = sfq_drop(sch, to_free);\n \t/* Return Congestion Notification only if we dropped a packet\n \t * from this flow.\n \t */\n@@ -628,6 +627,8 @@ static int sfq_change(struct Qdisc *sch, struct nlattr *opt)\n \tstruct tc_sfq_qopt_v1 *ctl_v1 = NULL;\n \tunsigned int qlen, dropped = 0;\n \tstruct red_parms *p = NULL;\n+\tstruct sk_buff *to_free = NULL;\n+\tstruct sk_buff *tail = NULL;\n \n \tif (opt->nla_len < nla_attr_size(sizeof(*ctl)))\n \t\treturn -EINVAL;\n@@ -674,8 +675,13 @@ static int sfq_change(struct Qdisc *sch, struct nlattr *opt)\n \t}\n \n \tqlen = sch->q.qlen;\n-\twhile (sch->q.qlen > q->limit)\n-\t\tdropped += sfq_drop(sch);\n+\twhile (sch->q.qlen > q->limit) {\n+\t\tdropped += sfq_drop(sch, &to_free);\n+\t\tif (!tail)\n+\t\t\ttail = to_free;\n+\t}\n+\n+\trtnl_kfree_skbs(to_free, tail);\n \tqdisc_tree_reduce_backlog(sch, qlen - sch->q.qlen, dropped);\n \n \tdel_timer(&q->perturb_timer);\n","prefixes":["net-next","v2"]}