From patchwork Tue May 26 17:10:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Machata X-Patchwork-Id: 1298227 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.a=rsa-sha256 header.s=selector1 header.b=LT5Hpa8O; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49WgTB37Hzz9sRK for ; Wed, 27 May 2020 03:10:38 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729527AbgEZRKh (ORCPT ); Tue, 26 May 2020 13:10:37 -0400 Received: from mail-eopbgr40061.outbound.protection.outlook.com ([40.107.4.61]:58964 "EHLO EUR03-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728444AbgEZRKg (ORCPT ); Tue, 26 May 2020 13:10:36 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DLXOxFU3TOAeYoEHjCmOsKD5yC3vpam5868fvf/2aVUrZ8WcF7NZ6Sak9XAAa/YT3PH9Dh+U7bGV2WAFufQbo4y6uTL10PuS+oGEpVYvBMkcWmk735FZUHRgJA8voGk7VZKBnMXWbhH6tXJW8MRmvdJwz53bskZlQT3T1GWYQsF8DI9S60LCQByKLx3S7tUf1URppq1FZ++5rIBeNO8k4a0T7tAt2qG0m/8S4Z5uEPzcwFBKtDEXh2qR+7X5cPshzlgFUaWJSUwKdSzyDdnk+Di5tNr+tbx9WgxHy147AcD/3ucbmQnF4pj/9I7p8dIopctlW/83WS3j18MWD/BszA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WAWvtO40Iap7jB6P/uF3xcsyiuCRmgLEklMtbEVIrQs=; b=Vnqu6b3TOnLGeYUiuVCSfOCRVIczRVmOhHUTSK44q96Do87OajyQ9Bjjz7+NbToW1pC67LVeoErpYjmgFvTZ9v95N9vyOJOkDEOvTHjiZA9zcVWymdrdgKPfZLRK5YsQjglfYVsd3VKyqCJRrE0mZyfR6RhfQgFKJOcWnON25qDgIlpl021z7tZxQebELdgUersyKZJuBSL3HhpIbmBIBnPGjoWO2cmziAwQbWdY46aHaWnBZRGx+q9Pfpwv/JJK6Zrv45qeYM9hoqS56zbBQTMemElMythX6v6TU0uEW0cGELdVDaFWq2leeTtTYaf9FDeRfl5miVJxbwajJew9+A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com; dkim=pass header.d=mellanox.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WAWvtO40Iap7jB6P/uF3xcsyiuCRmgLEklMtbEVIrQs=; b=LT5Hpa8O7ePEXr8SLifhJ4bxHRWsgibRu0QSWhpfkKRAILl3ewSL6GUWTWZIF/pX0T6fBqcKwavtWZb+Qzu07okSlZ7d092eydX71ybLtLE7ywTt5GS4XOAQRbtRLF8VcR7MlQ8c19q2px5HyW2xMpBFcpn9FHZ1w6VY7w7fySM= Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=mellanox.com; Received: from HE1PR05MB4746.eurprd05.prod.outlook.com (2603:10a6:7:a3::22) by HE1PR05MB3225.eurprd05.prod.outlook.com (2603:10a6:7:37::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3021.27; Tue, 26 May 2020 17:10:31 +0000 Received: from HE1PR05MB4746.eurprd05.prod.outlook.com ([fe80::454c:b7ed:6a9c:21f5]) by HE1PR05MB4746.eurprd05.prod.outlook.com ([fe80::454c:b7ed:6a9c:21f5%7]) with mapi id 15.20.3021.029; Tue, 26 May 2020 17:10:31 +0000 From: Petr Machata To: netdev@vger.kernel.org Cc: Jakub Kicinski , Eric Dumazet , jhs@mojatatu.com, jiri@mellanox.com, idosch@mellanox.com, Petr Machata Subject: [RFC PATCH net-next 1/3] net: sched: Introduce helpers for qevent blocks Date: Tue, 26 May 2020 20:10:05 +0300 Message-Id: <6ec558170c753c5b832b73dc999504483257b15c.1590512901.git.petrm@mellanox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: X-ClientProxiedBy: AM0PR02CA0034.eurprd02.prod.outlook.com (2603:10a6:208:3e::47) To HE1PR05MB4746.eurprd05.prod.outlook.com (2603:10a6:7:a3::22) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from dev-r-vrt-156.mtr.labs.mlnx (37.142.13.130) by AM0PR02CA0034.eurprd02.prod.outlook.com (2603:10a6:208:3e::47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3021.27 via Frontend Transport; Tue, 26 May 2020 17:10:30 +0000 X-Mailer: git-send-email 2.20.1 X-Originating-IP: [37.142.13.130] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: df8d6da8-4adb-4104-c675-08d80197b202 X-MS-TrafficTypeDiagnostic: HE1PR05MB3225: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-Forefront-PRVS: 041517DFAB X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JXwnvx9FVt5dTu4zQqvrS1UQ8DkjyzhxruAssS5nWCJRdVaTHbKBPJSmgp+NYd0/u6B0FwLQIMDP3wcWJIOKcED1VNuKxVo/dVBo5LHXxweYJz7zG7di/o6XEFo8zs/Jd/+jwmSgSjaMKsYEANOhB4m6XR5hJPeFPIBhU1yOyJE3GerQIcgkZQGtq4q3G7shezF96cZzrx42txSxtmKflE4jYB/gNTgPSV1RRVU85/733fXS286MbiUJ4LcyaCtF9G/32TPaAWO0G9nHaZt+S6xC16IexWb3kTH23CoKH+pReTB69PfOClDle2LALVMFDA9/PUxrLOHkdWLm4xCvyg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR05MB4746.eurprd05.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(346002)(376002)(136003)(396003)(39840400004)(366004)(956004)(6486002)(2616005)(26005)(186003)(52116002)(6506007)(86362001)(2906002)(8676002)(8936002)(16526019)(5660300002)(6666004)(36756003)(6512007)(54906003)(6916009)(66556008)(107886003)(4326008)(478600001)(66946007)(66476007)(316002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: maQ+ljnSZa2+BE9xf2gUhUTjf4MdsHautVR5MymkgViPbq5TJ4+T1FAAyuKsWnwmNB4aOAAvjuM4pxQii6/xBhySNyeCsj0Epqs4BOPMqJBQQu9CkhQDHl28TwpCKVNbETJzu2gXwcdijceqwjI4qSduIcebkV+8xtqyfxS1evXyNRoDRVMhRDzTTYGqv+ilCa1VoKldkF8V0EnEOa21VmeehMDcXw93/6TmrPMnu5q1/f/wP3odOK3VxvsNCYemE1iNvzMKLtSNmpnO9tH+6A96wqPtxPHnlGNmdhbYqMu0R44dv07FMEmUaILjMHCrenEkY5uKmTQiEkPH1v4Jyf3/4cG32w6RH2xYm58d3qmRVN0yh+u1kiR6Dg3gbZ4A7V1MuuiPloKWGVKe8FY+dbhB3IydUCpbdCDm02MgNvSpV094+UZr0zaKKtGsM9Dq0J/RliPtNb/QynATwmZTO/XIdeLjnLS4PN2HlURR66VYold9pyvWvzH2F+6Emh/e X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: df8d6da8-4adb-4104-c675-08d80197b202 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 May 2020 17:10:31.4389 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: pNSMq0TNyMQ693d80Vhv0dDVUGik/CVJb6P/GCViEnLvukQuvtaGVymuam9P5ywqvngnnNzqcfdxjT5z5MSVXg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR05MB3225 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Qevents are attach points for TC blocks, where filters can be put that are executed when "interesting events" take place in a qdisc. The data to keep and the functions to invoke to maintain a qevent will be largely the same between qevents. Therefore introduce sched-wide helpers for qevent management. Currently, similarly to ingress and egress blocks of clsact pseudo-qdisc, blocks attachment cannot be changed after the qdisc is created. To that end, add a helper tcf_qevent_validate_change(), which verifies whether block index attribute is not attached, or if it is, whether its value matches the current one (i.e. there is no material change). The function tcf_qevent_handle() is supposed to be invoked when qdisc hits the "interesting event" corresponding to this block. Signed-off-by: Petr Machata --- include/net/pkt_cls.h | 48 +++++++++++++++++++ net/sched/cls_api.c | 107 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 155 insertions(+) diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h index ed65619cbc47..efb20e3c2c98 100644 --- a/include/net/pkt_cls.h +++ b/include/net/pkt_cls.h @@ -32,6 +32,13 @@ struct tcf_block_ext_info { u32 block_index; }; +struct tcf_qevent { + int attr_name; + struct tcf_block *block; + struct tcf_block_ext_info info; + struct tcf_proto __rcu *filter_chain; +}; + struct tcf_block_cb; bool tcf_queue_work(struct rcu_work *rwork, work_func_t func); @@ -552,6 +559,47 @@ int tc_setup_cb_reoffload(struct tcf_block *block, struct tcf_proto *tp, void *cb_priv, u32 *flags, unsigned int *in_hw_count); unsigned int tcf_exts_num_actions(struct tcf_exts *exts); +#ifdef CONFIG_NET_CLS_ACT +int tcf_qevent_init(struct tcf_qevent *qe, struct Qdisc *sch, + enum flow_block_binder_type binder_type, + struct nlattr *block_index_attr, + struct netlink_ext_ack *extack); +void tcf_qevent_destroy(struct tcf_qevent *qe, struct Qdisc *sch); +int tcf_qevent_validate_change(struct tcf_qevent *qe, + struct nlattr *block_index_attr, + struct netlink_ext_ack *extack); +struct sk_buff *tcf_qevent_handle(struct tcf_qevent *qe, struct Qdisc *sch, + struct sk_buff *skb, struct sk_buff **to_free, + int *ret); +#else +static inline int tcf_qevent_init(struct tcf_qevent *qe, struct Qdisc *sch, + enum flow_block_binder_type binder_type, + struct nlattr *block_index_attr, + struct netlink_ext_ack *extack) +{ + return 0; +} + +static inline void tcf_qevent_destroy(struct tcf_qevent *qe, struct Qdisc *sch) +{ +} + +static inline int tcf_qevent_validate_change(struct tcf_qevent *qe, + struct nlattr *block_index_attr, + struct netlink_ext_ack *extack) +{ + return 0; +} + +static inline struct sk_buff * +tcf_qevent_handle(struct tcf_qevent *qe, struct Qdisc *sch, + struct sk_buff *skb, struct sk_buff **to_free, + int *ret) +{ + return skb; +} +#endif + struct tc_cls_u32_knode { struct tcf_exts *exts; struct tcf_result *res; diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c index 752d608f4442..f95a5eee9279 100644 --- a/net/sched/cls_api.c +++ b/net/sched/cls_api.c @@ -3801,6 +3801,113 @@ unsigned int tcf_exts_num_actions(struct tcf_exts *exts) } EXPORT_SYMBOL(tcf_exts_num_actions); +static int tcf_qevent_parse_block_index(struct nlattr *block_index_attr, + u32 *p_block_index, + struct netlink_ext_ack *extack) +{ + *p_block_index = nla_get_u32(block_index_attr); + if (!*p_block_index) { + NL_SET_ERR_MSG(extack, "Block number may not be zero"); + return -EINVAL; + } + + return 0; +} + +int tcf_qevent_init(struct tcf_qevent *qe, struct Qdisc *sch, + enum flow_block_binder_type binder_type, + struct nlattr *block_index_attr, + struct netlink_ext_ack *extack) +{ + u32 block_index; + int err; + + if (!block_index_attr) + return 0; + + err = tcf_qevent_parse_block_index(block_index_attr, &block_index, + extack); + if (err) + return err; + + if (!block_index) + return 0; + + qe->info.binder_type = binder_type; + qe->info.chain_head_change = tcf_chain_head_change_dflt; + qe->info.chain_head_change_priv = &qe->filter_chain; + qe->info.block_index = block_index; + + return tcf_block_get_ext(&qe->block, sch, &qe->info, extack); +} +EXPORT_SYMBOL(tcf_qevent_init); + +void tcf_qevent_destroy(struct tcf_qevent *qe, struct Qdisc *sch) +{ + if (qe->info.block_index) + tcf_block_put_ext(qe->block, sch, &qe->info); +} +EXPORT_SYMBOL(tcf_qevent_destroy); + +int tcf_qevent_validate_change(struct tcf_qevent *qe, + struct nlattr *block_index_attr, + struct netlink_ext_ack *extack) +{ + u32 block_index; + int err; + + if (!block_index_attr) + return 0; + + err = tcf_qevent_parse_block_index(block_index_attr, &block_index, + extack); + if (err) + return err; + + /* Bounce newly-configured block or change in block. */ + if (block_index != qe->info.block_index) { + NL_SET_ERR_MSG(extack, "Change of blocks is not supported"); + return -EINVAL; + } + + return 0; +} +EXPORT_SYMBOL(tcf_qevent_validate_change); + +struct sk_buff *tcf_qevent_handle(struct tcf_qevent *qe, struct Qdisc *sch, + struct sk_buff *skb, struct sk_buff **to_free, + int *ret) +{ + struct tcf_result cl_res; + struct tcf_proto *fl; + + if (!qe->info.block_index) + return skb; + + fl = rcu_dereference_bh(qe->filter_chain); + + switch (tcf_classify(skb, fl, &cl_res, false)) { + case TC_ACT_SHOT: + qdisc_qstats_drop(sch); + __qdisc_drop(skb, to_free); + *ret = __NET_XMIT_BYPASS; + return NULL; + case TC_ACT_STOLEN: + case TC_ACT_QUEUED: + case TC_ACT_TRAP: + __qdisc_drop(skb, to_free); + *ret = __NET_XMIT_STOLEN; + return NULL; + case TC_ACT_REDIRECT: + skb_do_redirect(skb); + *ret = __NET_XMIT_STOLEN; + return NULL; + } + + return skb; +} +EXPORT_SYMBOL(tcf_qevent_handle); + static __net_init int tcf_net_init(struct net *net) { struct tcf_net *tn = net_generic(net, tcf_net_id); From patchwork Tue May 26 17:10:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Machata X-Patchwork-Id: 1298228 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.a=rsa-sha256 header.s=selector1 header.b=fTr2Tfap; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49WgTF2TpBz9sRK for ; Wed, 27 May 2020 03:10:41 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729621AbgEZRKk (ORCPT ); Tue, 26 May 2020 13:10:40 -0400 Received: from mail-eopbgr40061.outbound.protection.outlook.com ([40.107.4.61]:58964 "EHLO EUR03-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728339AbgEZRKi (ORCPT ); Tue, 26 May 2020 13:10:38 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QUrYkZlAtA4tn1FK6CCD2WRKrzd+HEWJnYUWe64+V9fICFqB3lc2vUdbJcykgSyQN3wuPzSPUXMuEZ1PAcptzsZHhgpIznHmuO5JzJ4Gj14koFyUyhtQkEPot0kXJB3ZfpkkESmmkGRGaW3rvJOngxPeC0B87jsBdnaKMysGTygKLJSS7/1EFH66Vi1aPnbDpGuBS3PDt2pfnR+6rszg4w9pYdEw2E5R9ya0jyz3SMw1gJmN9xHrGRfX6NlGIzvnGjmKVdgzV81ySo0tHWCF00FGHRx4RRSyC1i2wLY6hGfeA7bzMhk8ldgwlArOv80vLIM4MSR9v4hWwnj8DAGAeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+57hAT6sJTVnYQl4H3ReYUIqovuLnXzDH/iVfmOQtmY=; b=aUuLrmOodriZMK6wijb0nQ2q/B9S+F2WiWenUeFerixVmmLA5URmvndQZ2XGPcfAl8VzyP92zSaiQgXGkila6HKi7mznI0l93HSPbqMxd3bp2VXc9CmAb982ctiqVe4GHwvn6cPjCOhar98c8VURj6fP29xMd3Hk+lbOnzuw9DkybbV1su0paa9i4oSABfxkEnJVWFtDoRUgXnliGxCMRAQwqqsUV0zJgo7bWDEbYyjwzSwlbOkmiBZBnbj5W3lm1+pfa2Q8/pCLFOj/yHuVBMzjUkSQh693HXmi0w5H5JF/zfYd5OtKe6a9ua5crVGXnYehLYYb+PQyCFEo5Cjfjg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com; dkim=pass header.d=mellanox.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+57hAT6sJTVnYQl4H3ReYUIqovuLnXzDH/iVfmOQtmY=; b=fTr2TfapOi2N3K1CyzNo3Do1BAMM1zL/7IoMFLx8LWPbtEEDHQAtOv3nRyKDEPGUe+nPtEGKRplZZVnx8LVbW0ls9l0UqH2WBV+ILnnGkQPWBEbM5B23pCKgMhL0UiHvHMfLQ9Fd8XBnthdTnEZ0ROlbSq73qKwDje/yUF5E+po= Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=mellanox.com; Received: from HE1PR05MB4746.eurprd05.prod.outlook.com (2603:10a6:7:a3::22) by HE1PR05MB3225.eurprd05.prod.outlook.com (2603:10a6:7:37::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3021.27; Tue, 26 May 2020 17:10:33 +0000 Received: from HE1PR05MB4746.eurprd05.prod.outlook.com ([fe80::454c:b7ed:6a9c:21f5]) by HE1PR05MB4746.eurprd05.prod.outlook.com ([fe80::454c:b7ed:6a9c:21f5%7]) with mapi id 15.20.3021.029; Tue, 26 May 2020 17:10:33 +0000 From: Petr Machata To: netdev@vger.kernel.org Cc: Jakub Kicinski , Eric Dumazet , jhs@mojatatu.com, jiri@mellanox.com, idosch@mellanox.com, Petr Machata Subject: [RFC PATCH net-next 2/3] net: sched: sch_red: Split init and change callbacks Date: Tue, 26 May 2020 20:10:06 +0300 Message-Id: X-Mailer: git-send-email 2.20.1 In-Reply-To: References: X-ClientProxiedBy: AM0PR02CA0034.eurprd02.prod.outlook.com (2603:10a6:208:3e::47) To HE1PR05MB4746.eurprd05.prod.outlook.com (2603:10a6:7:a3::22) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from dev-r-vrt-156.mtr.labs.mlnx (37.142.13.130) by AM0PR02CA0034.eurprd02.prod.outlook.com (2603:10a6:208:3e::47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3021.27 via Frontend Transport; Tue, 26 May 2020 17:10:31 +0000 X-Mailer: git-send-email 2.20.1 X-Originating-IP: [37.142.13.130] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 1b1533a9-7d57-44e3-e11f-08d80197b2ea X-MS-TrafficTypeDiagnostic: HE1PR05MB3225: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4714; X-Forefront-PRVS: 041517DFAB X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: I3jvxfjW5WDjb9TdnpRANZ0ZpnB+t2eFGyxN1vxL1HY1/mQm38hkSv9z8LQWlZVn3rJtpNMGP7YdkoC0RilzgLjps3+kjUHFk0mI7gDATNzb6ZbZ5PEfh3Npb2HNXq5McuFVzlv6DOPMK7Xrj1SqvZZKg6RfBwu9o+GFT2VP14yPOm+oFjiYZDHVYEfA6nSF0vJhzRSSt9BxUrjk4plI8YHCGJq0dYLO5i0JwcaoSXgJoGL4hDHb04ZWFvW8Rj97cnDApRkBiaNuOrKWUdgFfnOQLJuPcFjd+H/qt2+lBRTSZxnEiliAdymugfs17ZzmTUsYAARutBgnvaf/SsxDDw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR05MB4746.eurprd05.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(346002)(376002)(136003)(396003)(39840400004)(366004)(956004)(6486002)(2616005)(26005)(186003)(52116002)(6506007)(86362001)(2906002)(8676002)(8936002)(16526019)(5660300002)(6666004)(36756003)(6512007)(54906003)(6916009)(66556008)(107886003)(4326008)(478600001)(66946007)(66476007)(316002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: M8FdRTQXUBzsUkj52q2h/p4UNrVHhvStzc3C6tARMayGFUegQv/SpKzpHTM1hysdGwI8hLlFLsQ/eDt/qD8q6E1OyIsYSRzOY+MQpYMSCJJnDZ/P2L9ZLEkzdPSELZGm9MmY/HqcPYa5Kbtl1TUwt+zc04rAiIozoW6zoXvlhSEjKVo+u+ZopCibZ+hZ2owBw8H7553ri0Ss12I4N6/v3/Sa68cSPQWg80PtkXj6K4BpeHQE6KuMFPsoMJxiB33EV5zlxxEaxg7x4BCpxqGE2EJDsFbRNqY1NoPokrG/EavCJJ1XPMG9ggPa5E6Bb6aNbiCsYru3gVBQ4ZZEiy5w0cKCCbBQG/zYZqrMZbwSZN6x8jNn9xCdEgmLmyjS8sczUEt1fzmzU1MCQpGB+cpBwmIHXvZn9t81rrjcWIxmTgy0o1PdbiIVdgG0ovxz61Y7jRJGWVYTFpY+zPItL5UZkCE9Trs36X8eqPigyFZH0e/24bFDaaucUDMzgYDuEbhE X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1b1533a9-7d57-44e3-e11f-08d80197b2ea X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 May 2020 17:10:32.8890 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 1hdvFG3W2bnF9veMEBM7jeI97f6L/suQx5ZpG+jWE3bJgA+9+cTL6wv3PckzatAhbx+MwN1xGBUPZdsjIMatIQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR05MB3225 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In the following patches, RED will get two qevents. The implementation will be clearer if the callback for change is not a pure subset of the callback for init. Split the two and promote attribute parsing to the callbacks themselves from the common code, because it will be handy there. Signed-off-by: Petr Machata --- net/sched/sch_red.c | 43 +++++++++++++++++++++++++++++++------------ 1 file changed, 31 insertions(+), 12 deletions(-) diff --git a/net/sched/sch_red.c b/net/sched/sch_red.c index 555a1b9e467f..c52a40ad5e59 100644 --- a/net/sched/sch_red.c +++ b/net/sched/sch_red.c @@ -215,12 +215,11 @@ static const struct nla_policy red_policy[TCA_RED_MAX + 1] = { [TCA_RED_FLAGS] = NLA_POLICY_BITFIELD32(TC_RED_SUPPORTED_FLAGS), }; -static int red_change(struct Qdisc *sch, struct nlattr *opt, - struct netlink_ext_ack *extack) +static int __red_change(struct Qdisc *sch, struct nlattr **tb, + struct netlink_ext_ack *extack) { struct Qdisc *old_child = NULL, *child = NULL; struct red_sched_data *q = qdisc_priv(sch); - struct nlattr *tb[TCA_RED_MAX + 1]; struct nla_bitfield32 flags_bf; struct tc_red_qopt *ctl; unsigned char userbits; @@ -228,14 +227,6 @@ static int red_change(struct Qdisc *sch, struct nlattr *opt, int err; u32 max_P; - if (opt == NULL) - return -EINVAL; - - err = nla_parse_nested_deprecated(tb, TCA_RED_MAX, opt, red_policy, - NULL); - if (err < 0) - return err; - if (tb[TCA_RED_PARMS] == NULL || tb[TCA_RED_STAB] == NULL) return -EINVAL; @@ -323,11 +314,39 @@ static int red_init(struct Qdisc *sch, struct nlattr *opt, struct netlink_ext_ack *extack) { struct red_sched_data *q = qdisc_priv(sch); + struct nlattr *tb[TCA_RED_MAX + 1]; + int err; + + if (!opt) + return -EINVAL; + + err = nla_parse_nested_deprecated(tb, TCA_RED_MAX, opt, red_policy, + extack); + if (err < 0) + return err; q->qdisc = &noop_qdisc; q->sch = sch; timer_setup(&q->adapt_timer, red_adaptative_timer, 0); - return red_change(sch, opt, extack); + return __red_change(sch, tb, extack); +} + +static int red_change(struct Qdisc *sch, struct nlattr *opt, + struct netlink_ext_ack *extack) +{ + struct red_sched_data *q = qdisc_priv(sch); + struct nlattr *tb[TCA_RED_MAX + 1]; + int err; + + if (!opt) + return -EINVAL; + + err = nla_parse_nested_deprecated(tb, TCA_RED_MAX, opt, red_policy, + extack); + if (err < 0) + return err; + + return __red_change(sch, tb, extack); } static int red_dump_offload_stats(struct Qdisc *sch) From patchwork Tue May 26 17:10:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Machata X-Patchwork-Id: 1298229 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.a=rsa-sha256 header.s=selector1 header.b=ClY0eJaw; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49WgTJ1JtMz9sRK for ; Wed, 27 May 2020 03:10:44 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729762AbgEZRKn (ORCPT ); Tue, 26 May 2020 13:10:43 -0400 Received: from mail-eopbgr40061.outbound.protection.outlook.com ([40.107.4.61]:58964 "EHLO EUR03-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728444AbgEZRKm (ORCPT ); Tue, 26 May 2020 13:10:42 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=f8V9sB5JY4V5xZm/tFLacH8sqvBY9eVR/tX0oH79QNks70VXsTZ2HXk9E7NpBWo/JHt1Nifkv+DX+y73I+3wKUw9L0sfNXBefhAZysKNpp8Id5kqGsv8veTGw5kkH2pOOg8MAGkiNQNzBVGLrFdVWpeqXpSiTHENwKGU60Z2e9PDnZIbnCxPYWbhDHWyNJ/m/4teA+I8sGvtyQx8RUFBwFHd9PUsQuqLacL5hA3HDZa/IMxQ7PmXGR9U7IcgSfDPIvQ2Kxn+Aguna96nNpAEbHhT4Qje63qTLn8kgA3CfosixxYqR/POe2LZAqY/88jUSLBPIZggSnTymC2q/fi+cQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ALLyRWl7V771Gc9eTXXcQ2OaSqs9U262I63I4vzV9Kw=; b=BOTMkf5HC10idluZnwWXjVfv7Zk+NRTflg1HQJ6iUFP9XX0nCtkg8hcQEIVyD3ouumVim8cP8DUlGM2npYQTsVUikLihCCKDcdl2rpP8B1KIGWrfWKFsk3c9v3cWfgBeRC1yUxMQYY4y7B9b8Fi6SeN7Eps2/t2SZr6j++Bvq5uWsgdZzq7jth2ccEwJm0UxoyO7um/m0T1x6Vxg/Gh2hGFR09f1eTTGU6vs6z303MqxPM6+kRw+ZkS/QvYKq8pJ/eSewBfpoGTU4JgwejlMmLUyDj6TAYr3BxPqzUsikOEjzsQ7jXG6k3Czm8/OqNTVFL0H6kdw+uvbdjWx6m+fcg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com; dkim=pass header.d=mellanox.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ALLyRWl7V771Gc9eTXXcQ2OaSqs9U262I63I4vzV9Kw=; b=ClY0eJawa/Fi+8Mz27rmbvVVvxKHGsXSx2tLLI70gtyHWwuQ7/7d0auIyfoQ7uYx+I63SKPpKtBpfmy+lI4E8qc/nupPevtBk8wq6gnj3HQJlqIU4sxSZ5csg/j+ezzjoE8R8PRDJTpPlKEdyOBQN13CRJkB7hwU2HxMxrKeLVE= Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=mellanox.com; Received: from HE1PR05MB4746.eurprd05.prod.outlook.com (2603:10a6:7:a3::22) by HE1PR05MB3225.eurprd05.prod.outlook.com (2603:10a6:7:37::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3021.27; Tue, 26 May 2020 17:10:34 +0000 Received: from HE1PR05MB4746.eurprd05.prod.outlook.com ([fe80::454c:b7ed:6a9c:21f5]) by HE1PR05MB4746.eurprd05.prod.outlook.com ([fe80::454c:b7ed:6a9c:21f5%7]) with mapi id 15.20.3021.029; Tue, 26 May 2020 17:10:34 +0000 From: Petr Machata To: netdev@vger.kernel.org Cc: Jakub Kicinski , Eric Dumazet , jhs@mojatatu.com, jiri@mellanox.com, idosch@mellanox.com, Petr Machata Subject: [RFC PATCH net-next 3/3] net: sched: sch_red: Add qevents "early" and "mark" Date: Tue, 26 May 2020 20:10:07 +0300 Message-Id: <7c4c0ee1b5c4e0af61dc4ffb199df78b93499879.1590512901.git.petrm@mellanox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: X-ClientProxiedBy: AM0PR02CA0034.eurprd02.prod.outlook.com (2603:10a6:208:3e::47) To HE1PR05MB4746.eurprd05.prod.outlook.com (2603:10a6:7:a3::22) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from dev-r-vrt-156.mtr.labs.mlnx (37.142.13.130) by AM0PR02CA0034.eurprd02.prod.outlook.com (2603:10a6:208:3e::47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3021.27 via Frontend Transport; Tue, 26 May 2020 17:10:33 +0000 X-Mailer: git-send-email 2.20.1 X-Originating-IP: [37.142.13.130] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 7cca7565-4df6-4db9-1eee-08d80197b3cc X-MS-TrafficTypeDiagnostic: HE1PR05MB3225: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6790; X-Forefront-PRVS: 041517DFAB X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9s09jZ7KMauCpviaCE4ZbEuhMYmCzKKCQ/a/z3BTIwuPMWylC9Dql6xOMExl2uUo6aOWzG/bHlxx17twriQJGKlXDAoqXSB5zleQi/IuOFbhn5bixvF5fRJYaWtPjLSHPe1icU+EcOiRELpASp5JntPCRWPfcc/kUzcGfBldy6Y46NS7isvIHcjKprCKBy0RGSIB07+lUP1p+jnH4AqSmyeaORSGMTsZSmKQoo6ePbeRvXLaupj8j4sxGDN3tahZIJOBrgsEVZERbLy3Wa6mYKXfQjdydHfaWKYTa7Ias8hwe05+Tgsgvu9J6r4KRygLhwnk6JYay45U3e/OFoLPAg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR05MB4746.eurprd05.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(346002)(376002)(136003)(396003)(39840400004)(366004)(956004)(6486002)(2616005)(26005)(186003)(52116002)(6506007)(86362001)(2906002)(8676002)(8936002)(16526019)(5660300002)(6666004)(36756003)(6512007)(54906003)(6916009)(66556008)(107886003)(4326008)(478600001)(66946007)(66476007)(316002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 1pIZbMsmhpPvYTDSQdDCRP6QxQQC7znXVGhrpumROduicAbqe15tJVBbi7SReL0Dx/bRFLd4kYpRgM+wNqU1g8XwYQLw5VoeBwd3s4sj+rteyD/idJRH0gG0DETkz5Oa20A6BVGf6QpzsbxiTh2Mv+Lpb7C0sy1px+GGG1DDDnabJuvRTTWVTLy6IOsMcl5B+IMXMTf3zlk/v0ry6SA6fQnl3qob5WkXwBI4xiV+VPetUS7++BUb5aqOodfLEI1Z011+t4QrK6DMDzDgTe2cd3zQSiIcyCI4xLTQ6av21pUc3GThWds4Fg5d6zvZYIBpPoNL9FAZrs0ew0t8emliL71PqajORXVkDyEVXdXBUxhBkNaoZVxfX1AjyKw/cpr59+ZcGbl9BkLji6pifXDXKg1gdkMyXV3sPEil8jqbJreM1dbt3X1r3oZCxcrCE1i43zuvLdzgsympGsojURzk+KrQd/LlG0W7+36nGmZc/W04Y6QBLbTZdg9TI6XpFn0T X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7cca7565-4df6-4db9-1eee-08d80197b3cc X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 May 2020 17:10:34.6260 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: KFRH37/CSpOQNY8xRTp0PTW7k2BHwFTVmZU7+u8dMJSElPGz8T3WePtmdrxPViyQ22GoE3xrUZisZ3S7mWgOVA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR05MB3225 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In order to allow acting on dropped and/or ECN-marked packets, add two new qevents to the RED qdisc: "early" and "mark". Filters attached at "early" block are executed as packets are early-dropped, those attached at the "mark" block are executed as packets are ECN-marked. Two new attributes are introduced: TCA_RED_EARLY_BLOCK with the block index for the "early" qevent, and TCA_RED_MARK_BLOCK for the "mark" qevent. Absence of these attributes signifies "don't care": no block is allocated in that case, or the existing blocks are left intact in case of the change callback. For purposes of offloading, blocks attached to these qevents appear with newly-introduced binder types, FLOW_BLOCK_BINDER_TYPE_RED_EARLY and FLOW_BLOCK_BINDER_TYPE_RED_MARK. Signed-off-by: Petr Machata --- include/net/flow_offload.h | 2 ++ include/uapi/linux/pkt_sched.h | 2 ++ net/sched/sch_red.c | 59 +++++++++++++++++++++++++++++++++- 3 files changed, 62 insertions(+), 1 deletion(-) diff --git a/include/net/flow_offload.h b/include/net/flow_offload.h index 4001ffb04f0d..635d2bb57550 100644 --- a/include/net/flow_offload.h +++ b/include/net/flow_offload.h @@ -416,6 +416,8 @@ enum flow_block_binder_type { FLOW_BLOCK_BINDER_TYPE_UNSPEC, FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS, FLOW_BLOCK_BINDER_TYPE_CLSACT_EGRESS, + FLOW_BLOCK_BINDER_TYPE_RED_EARLY, + FLOW_BLOCK_BINDER_TYPE_RED_MARK, }; struct flow_block { diff --git a/include/uapi/linux/pkt_sched.h b/include/uapi/linux/pkt_sched.h index a95f3ae7ab37..ff3f4830e049 100644 --- a/include/uapi/linux/pkt_sched.h +++ b/include/uapi/linux/pkt_sched.h @@ -257,6 +257,8 @@ enum { TCA_RED_STAB, TCA_RED_MAX_P, TCA_RED_FLAGS, /* bitfield32 */ + TCA_RED_EARLY_BLOCK, /* u32 */ + TCA_RED_MARK_BLOCK, /* u32 */ __TCA_RED_MAX, }; diff --git a/net/sched/sch_red.c b/net/sched/sch_red.c index c52a40ad5e59..0c6a6429ca02 100644 --- a/net/sched/sch_red.c +++ b/net/sched/sch_red.c @@ -46,6 +46,8 @@ struct red_sched_data { struct red_vars vars; struct red_stats stats; struct Qdisc *qdisc; + struct tcf_qevent qe_early; + struct tcf_qevent qe_mark; }; #define TC_RED_SUPPORTED_FLAGS (TC_RED_HISTORIC_FLAGS | TC_RED_NODROP) @@ -92,6 +94,10 @@ static int red_enqueue(struct sk_buff *skb, struct Qdisc *sch, if (INET_ECN_set_ce(skb)) { q->stats.prob_mark++; + skb = tcf_qevent_handle(&q->qe_mark, sch, + skb, to_free, &ret); + if (!skb) + return NET_XMIT_CN | ret; } else if (!red_use_nodrop(q)) { q->stats.prob_drop++; goto congestion_drop; @@ -109,6 +115,10 @@ static int red_enqueue(struct sk_buff *skb, struct Qdisc *sch, if (INET_ECN_set_ce(skb)) { q->stats.forced_mark++; + skb = tcf_qevent_handle(&q->qe_mark, sch, + skb, to_free, &ret); + if (!skb) + return NET_XMIT_CN | ret; } else if (!red_use_nodrop(q)) { q->stats.forced_drop++; goto congestion_drop; @@ -129,6 +139,11 @@ static int red_enqueue(struct sk_buff *skb, struct Qdisc *sch, return ret; congestion_drop: + skb = tcf_qevent_handle(&q->qe_early, sch, + skb, to_free, &ret); + if (!skb) + return NET_XMIT_CN | ret; + qdisc_drop(skb, sch, to_free); return NET_XMIT_CN; } @@ -202,6 +217,8 @@ static void red_destroy(struct Qdisc *sch) { struct red_sched_data *q = qdisc_priv(sch); + tcf_qevent_destroy(&q->qe_mark, sch); + tcf_qevent_destroy(&q->qe_early, sch); del_timer_sync(&q->adapt_timer); red_offload(sch, false); qdisc_put(q->qdisc); @@ -213,6 +230,8 @@ static const struct nla_policy red_policy[TCA_RED_MAX + 1] = { [TCA_RED_STAB] = { .len = RED_STAB_SIZE }, [TCA_RED_MAX_P] = { .type = NLA_U32 }, [TCA_RED_FLAGS] = NLA_POLICY_BITFIELD32(TC_RED_SUPPORTED_FLAGS), + [TCA_RED_EARLY_BLOCK] = { .type = NLA_U32 }, + [TCA_RED_MARK_BLOCK] = { .type = NLA_U32 }, }; static int __red_change(struct Qdisc *sch, struct nlattr **tb, @@ -328,7 +347,35 @@ static int red_init(struct Qdisc *sch, struct nlattr *opt, q->qdisc = &noop_qdisc; q->sch = sch; timer_setup(&q->adapt_timer, red_adaptative_timer, 0); - return __red_change(sch, tb, extack); + + q->qe_early.attr_name = TCA_RED_EARLY_BLOCK; + q->qe_mark.attr_name = TCA_RED_MARK_BLOCK; + + err = __red_change(sch, tb, extack); + if (err) + return err; + + err = tcf_qevent_init(&q->qe_early, sch, + FLOW_BLOCK_BINDER_TYPE_RED_EARLY, + tb[TCA_RED_EARLY_BLOCK], extack); + if (err) + goto err_early_init; + + err = tcf_qevent_init(&q->qe_mark, sch, + FLOW_BLOCK_BINDER_TYPE_RED_MARK, + tb[TCA_RED_MARK_BLOCK], extack); + if (err) + goto err_mark_init; + + return 0; + +err_mark_init: + tcf_qevent_destroy(&q->qe_early, sch); +err_early_init: + del_timer_sync(&q->adapt_timer); + red_offload(sch, false); + qdisc_put(q->qdisc); + return err; } static int red_change(struct Qdisc *sch, struct nlattr *opt, @@ -346,6 +393,16 @@ static int red_change(struct Qdisc *sch, struct nlattr *opt, if (err < 0) return err; + err = tcf_qevent_validate_change(&q->qe_early, tb[TCA_RED_EARLY_BLOCK], + extack); + if (err) + return err; + + err = tcf_qevent_validate_change(&q->qe_mark, tb[TCA_RED_MARK_BLOCK], + extack); + if (err) + return err; + return __red_change(sch, tb, extack); }