{"id":805796,"url":"http://patchwork.ozlabs.org/api/patches/805796/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/1503646997-94678-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":"<1503646997-94678-1-git-send-email-gfree.wind@vip.163.com>","list_archive_url":null,"date":"2017-08-25T07:43:17","name":"[net-next,RESEND] sched: sfq: drop packets after root qdisc lock is released","commit_ref":null,"pull_url":null,"state":"superseded","archived":true,"hash":"9aa27265a9aff1bb388e7b2acd8f14a8437a37f3","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/1503646997-94678-1-git-send-email-gfree.wind@vip.163.com/mbox/","series":[],"comments":"http://patchwork.ozlabs.org/api/patches/805796/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/805796/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 3xdtXv2JxWz9s8P\n\tfor ;\n\tFri, 25 Aug 2017 17:47:11 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1754663AbdHYHrJ (ORCPT );\n\tFri, 25 Aug 2017 03:47:09 -0400","from m181-177.vip.163.com ([123.58.177.181]:42167 \"EHLO\n\tm181-177.vip.163.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1754521AbdHYHrI (ORCPT\n\t); Fri, 25 Aug 2017 03:47:08 -0400","from ikuai8.com (unknown [123.112.220.147])\n\tby smtp2 (Coremail) with SMTP id oWZ4CgDHU10V1Z9ZJTLvKA--.47345S2;\n\tFri, 25 Aug 2017 15:43:31 +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 RESEND] sched: sfq: drop packets after root qdisc\n\tlock is released","Date":"Fri, 25 Aug 2017 15:43:17 +0800","Message-Id":"<1503646997-94678-1-git-send-email-gfree.wind@vip.163.com>","X-Mailer":"git-send-email 1.9.1","X-CM-TRANSID":"oWZ4CgDHU10V1Z9ZJTLvKA--.47345S2","X-Coremail-Antispam":"1Uf129KBjvJXoW7Cw1DGrWDGF13AFW3Zr1xAFb_yoW8uw1kpa\n\t9IvwsxWr4UKr4xWr9Yyw4xX3W3Kr4fK3sxWF1Y93yFqFn8tryFqFy8Gr1Ykr43GryrCa17\n\tZr1Y9ryfKr43CF7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2\n\t9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jUsqXUUUUU=","X-Originating-IP":"[123.112.220.147]","X-CM-SenderInfo":"5jiuvvgozl0vg6yl1hqrwthudrp/1tbiHQQ-s1Qj2l-OIwAAsK","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 net/sched/sch_sfq.c | 16 ++++++++++------\n 1 file changed, 10 insertions(+), 6 deletions(-)","diff":"diff --git a/net/sched/sch_sfq.c b/net/sched/sch_sfq.c\nindex 82469ef..8841f4d 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,13 @@ 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\tif (likely(to_free)) {\n+\t\t\tqdisc_drop(skb, sch, to_free);\n+\t\t} else {\n+\t\t\tqdisc_qstats_drop(sch);\n+\t\t\tkfree_skb(skb);\n+\t\t}\n \t\treturn len;\n \t}\n \n@@ -360,7 +364,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 +469,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@@ -675,7 +679,7 @@ static int sfq_change(struct Qdisc *sch, struct nlattr *opt)\n \n \tqlen = sch->q.qlen;\n \twhile (sch->q.qlen > q->limit)\n-\t\tdropped += sfq_drop(sch);\n+\t\tdropped += sfq_drop(sch, NULL);\n \tqdisc_tree_reduce_backlog(sch, qlen - sch->q.qlen, dropped);\n \n \tdel_timer(&q->perturb_timer);\n","prefixes":["net-next","RESEND"]}