From patchwork Tue May 26 17:10:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Machata X-Patchwork-Id: 1298230 X-Patchwork-Delegate: dsahern@gmail.com 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=j3Tvt0Ou; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49WgTL54xTz9sSd for ; Wed, 27 May 2020 03:10:46 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388099AbgEZRKp (ORCPT ); Tue, 26 May 2020 13:10:45 -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 S1728339AbgEZRKo (ORCPT ); Tue, 26 May 2020 13:10:44 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BFEY73RNz77P/Fkp+yFdx5ixIc6w1Yucbb0dqVBFhblkWF6XuTcUGM3kqS0i7I256beo8LmEepe9GMph6ftJ2DefFbrUrk5M/KMNA+NYPtFxpGBKkEh32nji35lCgGqY1LZanFay4brVPh4JuBYKnAbhs1qgT0XdneBSwXvHxgPeZUKfW+59iInj6RjZAxBEecNlwf1g4WGNM3USXi8+qiScywQg2me79lbvpYva081sm1az6FPQOeStLAsjyfZcSu6gXhZMfTNG83QrbG++lxo1wdEu51eTQbLVxVgNmhO5gmlnbyuM1wDrCr8fmgsWepAm/Cfhl+Am4ocVuVtQzA== 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=qpJ6OItV4Be4W+lnnv60DCs9G8TRjZUA7ZkzI5FtPjU=; b=Sh/8q5GKkxdmnfbh8gtXdJXabO8ehlqnOmofyPsx12oUXy1id9PcLM06xu9kLs9sDJ/V7jIZ5c/UyoNv8VavwgIPNYn88YuPT4m33uMpEhY+QNni8Et1CYn+3r6AGhFDAqS/2I35S/Fbqci4gqHsVEXyK6FTwjgOm9oCMG33ikiqLPWCnKsKp8dPLPzTNns+rWnuHUQWeLYirkDIahaIo6QKsNiJhmx/lyY1Hha68JNcoXdmr9cSxNoY8VquiY3ZAJenaB7+pOHVFNUyHb6fguXdMfItVamAq522eFqiwS7eY/qNHYKtMBWQDmlnpWWCe5aZk7/+5BeelsGoCCLpZg== 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=qpJ6OItV4Be4W+lnnv60DCs9G8TRjZUA7ZkzI5FtPjU=; b=j3Tvt0OugQqnIFQ8vN5zunFulrSJ4oGQpOCedN7fb7ayKsA8ZNcJ75gyPt99CqTLFqGX7te8KbJ2+Q9d4l1N0rLIbbRtowkQ2ENJW5w8kot7nYfL/m6mTi7y0DdQGqlRlLQWS9xRSvKsZNzEHS8bUd7/daRjW/Jmxgmy2zdgZl8= 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:36 +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:36 +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 iproute2-next 1/4] uapi: pkt_sched: Add two new RED attributes Date: Tue, 26 May 2020 20:10:08 +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:34 +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: 16940c0f-ce68-4795-d79b-08d80197b4d6 X-MS-TrafficTypeDiagnostic: HE1PR05MB3225: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:296; X-Forefront-PRVS: 041517DFAB X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FOrka8Et4Fx3ysJUH7NsVhqTRtNBAOdlc8UAOxodaUUKGEgFDV1KmR9L3wlx6GNchnVM6RUjLB565QYSYmt2anUZetc0sKQ20KzwK2UDNBvPSNjbgGoMCwCJHS/62Q0lygv0gQ1NbFjiZjn/jk8MSfKkzgKKn7Nje1mRd7GXSfqQynn8Mmj32meaU0zsiuC89mLpzNJ0RLPacTRe98Iv7kf3y9xKQaZG8WzSNcdy5VaDZ0N15gRfJP93yYNe+kq6v2F5o4609a3OvrISPwpvirdRPJfzgGJEXre6U2DhLGJr7PNbu8XNY2u4ku6cTvkyIJHXnoWtpRQeFDU8quS5cQ== 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)(4744005)(478600001)(66946007)(66476007)(316002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: fMDpYmdJaspnbSSbTETJ900Qsb7k19EdedrGCXVfwbRbR2sPTy+hS4oHhSzsHCwFNOzPg0ql80tnzP0Ko0UcgqYf3oa58KSbbUgqytPtit/o0XJALqE0vm4IMv2IFz3UZSsv0zpXmlkyJwYkrAn+Qq2uzLgkRHJgp4R4ikTNgAsc+yDF2/+9NMBNTomYz4/ipV/9VIURUecSAXfpw1I55qOb2HAK2pyq/dLMflwWoPKe33akjavwyK57dRKiZBF8SnQGFqq2/UBGEl/iBoZz7Bj/uATw0/8ZZ2KwBOD9UJtODZ4+ti1PHrSHyVAIiS8bNlVOef14APZFdQPKclR+kBuzLu87mULESKdE68fXrGJdEvmYHX6V1xzshocTZsZ6VWVxnl7ioc7nBQFCMQ7RsQYM9WK5DITtbXh5y7xUzQ+ZGIcuDO7bz7gzKXnqY0o/uKYbERA7ofCEZ+nnd3ywqb2lb9iCrzl2PrwcilK2P/F4yT9K36cR2RZSfh+E9VEc X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 16940c0f-ce68-4795-d79b-08d80197b4d6 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 May 2020 17:10:36.1931 (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: 8Wgnbwi1BgdZgPVwdp1lfNY6KO4utbYnTBklBWIf7JGzcK15unLMj6wDwfgf2kLNMELA/UC4IjaDI6Wl0OeVoA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR05MB3225 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Petr Machata --- include/uapi/linux/pkt_sched.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/uapi/linux/pkt_sched.h b/include/uapi/linux/pkt_sched.h index 0c02737c..203272df 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, }; From patchwork Tue May 26 17:10:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Machata X-Patchwork-Id: 1298231 X-Patchwork-Delegate: dsahern@gmail.com 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=BGai7YvZ; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49WgTR298qz9sRK for ; Wed, 27 May 2020 03:10:51 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729897AbgEZRKt (ORCPT ); Tue, 26 May 2020 13:10:49 -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 S1728444AbgEZRKs (ORCPT ); Tue, 26 May 2020 13:10:48 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Qy0rQnbxo/lfIoJ4HLUnLbuk5geJD11yd6/Oznt8JRWnFtOFcVSe5q1iIZWEDWus53nAckNo5xit5ArU35iqJK+mqF5tpSpmvOMyrobY2zsJjCKwnx5LQMYeR9H/rQsU+WoZXm/eYbGGp/mhQgbfxf56StSAdGnD5xIDZvE6n94hNgP9Q1rsEwsvJPOLsTpwfe5+H0wL/MsgZSAQuze+ER9s1FjQ1Efi173lb+8E4+aRdlUDt5/T2uhgAyKzu/kFYEZObe1EJiGw2hqmUVgtl5CqEyFpb0369mWBTwhZGTusmfH8MTrA7j3VXLSjTVY21+D9zobUaLriy70L0Z43XA== 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=aNbsJmUiwX+GXv7ynDP2xG4jM/DsguZhc8LSMbrrpCI=; b=b68UV/09pchg/lOyFmJ1SjUfpSt5c5UkMXFcePm3E/qWDERi321IWZpeE4BvVnUtkjHJ6N80QAe78wVrsU57S/w2yZF07/UVEZIfoOfK1Ow42eKzZiFMs6yWyD4YAbg4zumJ5FrOezLQl1tcjBz0pqpmzuqC3naHqR64izc3cazSj0qQBSKPeNviYxz4fXDv6dNVK9iMcaKU0D9anQbKPQVNRoaJifxJNpmAv7h2SldejAsoblOfYWlCydsTS+O3X0DG58QIn9dSDN0IyH/JJepNlx/ucPI4kcxIkG3lGPEuDnP75RCVqtpwLZ943Uo10danuOyViwnmK8mZLSwvbw== 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=aNbsJmUiwX+GXv7ynDP2xG4jM/DsguZhc8LSMbrrpCI=; b=BGai7YvZtEcw71Ikb9CrDrKjvqP6CQrxHUMkcIvMA6bBJyH8e77GldqcCLi7+qumGtIepN69Dmj2chZbEBTYxs2nrufFRmzDpGr1jgjLcz9FGME5/mOzaav4D1EsdqWbfE67ra+9T/fLYidC692KiqPiEpQ9eKBWIhHvdloXRgo= 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:37 +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:37 +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 iproute2-next 2/4] tc: Add helpers to support qevent parsing Date: Tue, 26 May 2020 20:10:09 +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:36 +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: a57cc170-ea76-47ef-0fa9-08d80197b5cc X-MS-TrafficTypeDiagnostic: HE1PR05MB3225: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-Forefront-PRVS: 041517DFAB X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iEOcJ8AEMykbA75TPZT9IwVrrdzqF3LGm8s+C0FDUmprFS8JCWeGqMap0zIyYF6mBFiqsRfTpgP1f8nRTnf2Po0aymNec6DMsnR5zXUqPt7m39M/TNETFszlqcazAjXCqfP3gwIXb0TcnOzLXZIs8ek8orpvCclk+AB9fcSIJWm2eSye23gB+m7pzODpFXYS33UXu3+xaIJsMgvXJ/evR3cJGTFm0jxo8LwRyLnmGi2f9Ucft9smk/6Q706s+UW0g5hlyA8HJb75Fir/rvG7ci3l/V1eA6RLDURGeG3IeQ239/Vl5ZhPWjG9GTjoh3FBjGAJD5mFYMq0B22BrDvzxw== 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: /YLVMSRiHP/xCOKKHqeUnbkAkAtqV2JcCCXMmuh8Oj/DFX6puFgGr/raKnM/dDP2C3xqwfrcglN9l9xJMkaMqxM7dSql/OGAIsyGZOLUgJXn9S8ksGTMjS713UnGhyuDU0LBB8QdlxduzmnsaH3YsZ7r5w2BDjyC8/+vKGEAR7wDp1ENdEJRbrJLjU39uoqbnpTvaxh2L5Rss51k7sl/QG3b7kJIliOITWQmd8W/eb2YNXz61tbS/8XEkAiDH+7TzRooUA6CDJbUfQhmJhf3l82uegdfXXX0FDB3JaoinoFPt2Nlct9sgn80QIlJWYNa8onlL+JX3aJN66YQ2/lWPPi0gjH8FwAzfXhHPveMB+VbXKrKQU7jMgcPMXLRB1AsvGq0Z//z5xHFlsTLxk3N96trVnBv6RrEaolY3wM/8W2/1GWrCCcGo2M/4XSyppMaKUrHr1TsR+bPqTuuoIt4aewXP2PIHkxur7eCyM3HN9+0up/4wjlCQDQZ1uTRkqG1 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: a57cc170-ea76-47ef-0fa9-08d80197b5cc X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 May 2020 17:10:37.7992 (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: WfNdhXHd0RZT+w1mxbBx7te2AWoL47zyRGUDxRJIonOtbydsuCInvWW2jSCcVgE9IVG09FN3Ju/6QMot6bYIxg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR05MB3225 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Introduce a set of helpers to make it easy to add support for qevents into qdisc. The idea behind this is that qevent types will be generally reused between qdiscs, rather than each having a completely idiosyncratic set of qevents. The qevent module holds functions for parsing of these common qevent types, and for dispatching to one of the parsers based on the qevent name. Signed-off-by: Petr Machata --- tc/Makefile | 1 + tc/tc_qevent.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++ tc/tc_qevent.h | 34 +++++++++++++++++++++ 3 files changed, 118 insertions(+) create mode 100644 tc/tc_qevent.c create mode 100644 tc/tc_qevent.h diff --git a/tc/Makefile b/tc/Makefile index e31cbc12..10567f33 100644 --- a/tc/Makefile +++ b/tc/Makefile @@ -121,6 +121,7 @@ TCLIB += tc_red.o TCLIB += tc_cbq.o TCLIB += tc_estimator.o TCLIB += tc_stab.o +TCLIB += tc_qevent.o CFLAGS += -DCONFIG_GACT -DCONFIG_GACT_PROB ifneq ($(IPT_LIB_DIR),) diff --git a/tc/tc_qevent.c b/tc/tc_qevent.c new file mode 100644 index 00000000..f2b22778 --- /dev/null +++ b/tc/tc_qevent.c @@ -0,0 +1,83 @@ +// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause + +/* + * Helpers for handling qevents. + */ + +#include +#include + +#include "tc_qevent.h" +#include "utils.h" + +int qevent_parse(struct qevent_util *qevents, int *p_argc, char ***p_argv) +{ + char **argv = *p_argv; + int argc = *p_argc; + const char *name = *argv; + int err; + + for (; qevents->id; qevents++) { + if (strcmp(name, qevents->id) == 0) { + NEXT_ARG(); + err = qevents->parse_qevent(&argc, &argv, + qevents->data); + if (err) + return err; + + *p_argc = argc; + *p_argv = argv; + return 0; + } + } + + fprintf(stderr, "Unknown qevent `%s'\n", name); + return -1; +} + +static int parse_block_idx(const char *arg, struct qevent_base *qeb) +{ + if (qeb->block_idx) { + fprintf(stderr, "Qevent block index already specified\n"); + return -1; + } + + if (get_unsigned(&qeb->block_idx, arg, 10) || !qeb->block_idx) { + fprintf(stderr, "Illegal qevent block index\n"); + return -1; + } + + return 0; +} + +int qevent_parse_plain(int *p_argc, char ***p_argv, void *p_data) +{ + struct qevent_plain *qe = p_data; + char **argv = *p_argv; + int argc = *p_argc; + + if (qe->base.block_idx) { + fprintf(stderr, "Duplicate qevent\n"); + return -1; + } + + while (argc > 0) { + if (strcmp(*argv, "block") == 0) { + NEXT_ARG(); + if (parse_block_idx(*argv, &qe->base)) + return -1; + } else { + break; + } + NEXT_ARG_FWD(); + } + + if (!qe->base.block_idx) { + fprintf(stderr, "Unspecified qevent block index\n"); + return -1; + } + + *p_argc = argc; + *p_argv = argv; + return 0; +} diff --git a/tc/tc_qevent.h b/tc/tc_qevent.h new file mode 100644 index 00000000..548f3fc6 --- /dev/null +++ b/tc/tc_qevent.h @@ -0,0 +1,34 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _TC_QEVENT_H_ +#define _TC_QEVENT_H_ + +#include + +struct qevent_base { + __u32 block_idx; +}; + +struct qevent_util { + const char *id; + int (*parse_qevent)(int *argc, char ***argv, void *data); + void *data; +}; + +#define QEVENT(_name, _parser, _data) \ + { \ + .id = _name, \ + .parse_qevent = qevent_parse_##_parser, \ + .data = ({ \ + struct qevent_##_parser *__data = _data; \ + __data; \ + }), \ + } + +int qevent_parse(struct qevent_util *qevents, int *p_argc, char ***p_argv); + +struct qevent_plain { + struct qevent_base base; +}; +int qevent_parse_plain(int *p_argc, char ***p_argv, void *p_data); + +#endif From patchwork Tue May 26 17:10:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Machata X-Patchwork-Id: 1298232 X-Patchwork-Delegate: dsahern@gmail.com 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=gvizpGOv; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49WgTS22K0z9sSd for ; Wed, 27 May 2020 03:10:52 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388355AbgEZRKv (ORCPT ); Tue, 26 May 2020 13:10:51 -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 S1729825AbgEZRKu (ORCPT ); Tue, 26 May 2020 13:10:50 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CLGavh/EEoxRSMY1ZTv0BFWSvX/OAFGU2nuLtaB3JZSipLp7rqzI/qZAmQn0PW79TB8h0NoJjKiS1Cj35YwYnlBC6UY5jKVdBHJp6o4/PWlQyb2ZN1zOyQjQYQ5cnzNRVZilKHyfHjeMEnZcjUdZhHlvMNyHaAIkw0jw1kFtgjF/Om0XuZAzc9XayFXxZ9pH/F6uVZs1rgCgWWG5QwleNCbHrbqIZql8rtKGiOQjJ1Clz+1xiM4mtx83KN57PPK2m40MA2C52kNZykTo0oTV4NcexI6TAnQkNA42a0zCcVhXCg7gMRdYhCYiW8hE0IGEOk8XU15I+WshwitvdSo/2A== 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=NFvt3AYzLc8vnVuXKAbqnOwhelN/2Q1uZcpGzQ5CF1A=; b=LTZ4nZJodYxflDcSUZDaC//sEP0kU6BfvCXs7Ap7ZSLbhNdmqdsxEkAkAcqEnAMdLl1PkqJWlJzY6zI03jfZ0zuX+OHv1U7iJKuIBIVQIaopgCCft9tNu3zcMjnBGRkF4y4msLPrGM8pG9bkmJ7ajjKB/AXj/LKVYWuI1dDsCZzm0KCs6jN70mzxWRHAdD9PZp1fFBGLU3OKcpHT3SFSAHSoP0Cv8Woa64T8xqgXirFYg/5Tp4NeiLXOP6iv9p98UkbI/8haoW+utw8qYT3bblz449PoHasS29xEIWWy9KDeARYmLxjaiwcsFHJKee5qB0eL3TWVwQFPAZ63sfAGxQ== 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=NFvt3AYzLc8vnVuXKAbqnOwhelN/2Q1uZcpGzQ5CF1A=; b=gvizpGOvlUUFZUbo3F7q2o0l7xWu4Ps3bX4cv8gMAvrWwPidOR0uwelT76fczd06Adao13baYQPnDYibo//zCsRdFUQPSKdQqoEOTuQoCUjqI1o81XHepTKOo8r5ANzgySIsqIcx63CDup+/8mmOyL4hjKvCIaUAonQKxKCSBc0= 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:39 +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:39 +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 iproute2-next 3/4] man: tc: Describe qevents Date: Tue, 26 May 2020 20:10:10 +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:38 +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: 87cdd3ec-9fd9-41c6-1b92-08d80197b6cc X-MS-TrafficTypeDiagnostic: HE1PR05MB3225: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-Forefront-PRVS: 041517DFAB X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: snUsiryf1FPIT6mU4NDBI3wEhp6iJDc6+inUcxD02Y/CBz4jZVyVQfO/T06ZwWic7jvt4pnC6XDk5lozeqSxb9ZrRKmEggQrZxen3z8hB36toV6SOt3l/Q5iCnNqn468sZkZC9lnxlHUe22Qgjp3u9JGU6EEd6pXzKf49z3Th5ClfcdQgRhsB/pXi9w5syAtMPlvN7WYyOcFSoztVs/VidDA2vuM/lnwsL+HNwzHDY2Mw51xJ4mpqTMNuEgrWPAITA72ea4z4C8qBOn2JM+WgExvpaFJZL2doqgrEjaGYZWUOb5sGQ1AVsu5rO4tpOnRQ5azbxkQ507ZHXeHb4eQDA== 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: GpX/T1OVz5zcbsNV+ePgMHVJxjnLQ5XMKFNSejnvp7rlInN3Zry+VwS9VOMITFjb08Y5zxlyGDvFxgUeR1VhmfySbvhhUX/AE87ayF1i7YqbgnjGt4Wbz/11ZTF5Q0mXRt/Yb9hl0UR/kDMxriCCQu0/TJofXx48qnB2sf+7SteQC+dgv4C+poVWnfndi8C81qFkq7bX+FmlfAxqeDsUmyzCXeaxau1aGTZ+x1OyHnAeW0WUd2KqqD41mfWgGkXcWAL87jMy7oPEwV7mX1pDn/znoMiXWp2qH4+ROrhPtJVEJaKMptc0TkQCUfgD+JKwnJ12LVjY7qTSaRBjn+HtWD1YsL8PgDGHpaTd/eUzIUI5Nc9zE8Gs/zAE6J7oiPEV7Kmt1LCZDi7UwDizu0gVnWlNJz5JPXl/jGZwLtYVgXGqBj5MScxJ2OrRNltAo/SdupLvyjJqh3TrhulBPrRxfd7ECM9uOo2QqeGfEMw2jhDh/dlW4EfWq4PjmH1UsXsk X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 87cdd3ec-9fd9-41c6-1b92-08d80197b6cc X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 May 2020 17:10:39.5791 (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: mbWDmdm8LKvykaWJsH+5YcqBtr5mvdGRqAiHWhtnV0EdGLa6wymJ/3AWIkdwZ4YEdTQTiDqiU4P2vPDBneSw/Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR05MB3225 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add some general remarks about qevents. Signed-off-by: Petr Machata --- man/man8/tc.8 | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/man/man8/tc.8 b/man/man8/tc.8 index e8e0cd0f..970440f6 100644 --- a/man/man8/tc.8 +++ b/man/man8/tc.8 @@ -254,6 +254,25 @@ Traffic control filter that matches every packet. See .BR tc-matchall (8) for details. +.SH QEVENTS +Qdiscs may invoke user-configured actions when certain interesting events +take place in the qdisc. Each qevent can either be unused, or can have a +block attached to it. To this block are then attached filters using the "tc +block BLOCK_IDX" syntax. The block is executed when the qevent associated +with the attachment point takes place. For example, packet could be +dropped, or delayed, etc., depending on the qdisc and the qevent in +question. + +For example: +.PP +.RS +tc qdisc add dev eth0 root handle 1: red limit 500K avpkt 1K \\ + qevent early block 10 +.RE +.RS +tc filter add block 10 matchall action mirred egress mirror dev eth1 +.RE + .SH CLASSLESS QDISCS The classless qdiscs are: .TP From patchwork Tue May 26 17:10:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Machata X-Patchwork-Id: 1298233 X-Patchwork-Delegate: dsahern@gmail.com 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=WcmzP5ar; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49WgTW48cnz9sRK for ; Wed, 27 May 2020 03:10:55 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388419AbgEZRKz (ORCPT ); Tue, 26 May 2020 13:10:55 -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 S2388093AbgEZRKx (ORCPT ); Tue, 26 May 2020 13:10:53 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AJ40xOJi5ln8b7gzBEhA6qF0JUPG528dZTQx3yTUKPwI23EpEeGQacCtxNiqvmYkE5NwAQdJ3dh7AxUKTiQNN4HFhkmK6qyObmGNfXCmkSU2VUbpApltHkSkyDjEIoTTxaZEtW19wXBmrYkRun0GoCDnG1luhG57NV4etYmxpeDEqsgd8YNqOTTkiQu6UH9hQXht1FMmook9vGXJaK+jNLIYhYmjoWGnFKeJtloTdP+PMXovanw0qK/lkqcrG4K8e/vTMmJUBxV4LLClxa1cBATrI1CAxRVWyLLFfYskfnDrMqT7C9NH5xlvuxWjaivfpWDkF7dM6RugBIVWW0Od6g== 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=mT5VjUkgPTMUMRh4hwXkiT5n4MohfHn3OeEeq2Tw24M=; b=iWKh8gB0HLp8+QOozd3at/mFeedXyTrp4SchTzh0mSSgyo8OPDrbIgPqDnxDnjBx36erf35LU8XqAO0Eo94oZFNNjTKImZuFIg+opqBIHk18n0rsHmSB/VsMYyd2nLGf1/iJi0kiNCQ31q6nKrPWReVKB3vKboPLYEVhMu3v/dwiWpDeEwG28T3e4HGMNQHWjCilDT+/tdFJb/odHtdjzqXoSbscsAV7jKj7X+orI+Qv5GMpimi/HQgp6U232ben/lIsLoFPLWJs5qd1NgjqODDT/D7zdAVxXuJmVi2u+LSsQnOM2GLiny3iXRGR4m3SgYqO/TokTi2lXpOjKvWjKg== 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=mT5VjUkgPTMUMRh4hwXkiT5n4MohfHn3OeEeq2Tw24M=; b=WcmzP5arPgbludyqZnrv7KHDUfdpP/TzYUnVIbxa1lKqIZ+P0NBk9CbZD848kZiTb4p244Op44GGVehUOHWUO8Uam+u3xrw9t7WrCxvoBKvVF1KinEyPvmHKl3QRxCU++2mBzp60fZjfaGuqqh3/cMIqQi0+6LejRB96m+MPnHM= 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:41 +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:41 +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 iproute2-next 4/4] tc: q_red: Add support for qevents "mark" and "early" Date: Tue, 26 May 2020 20:10:11 +0300 Message-Id: <0c9025dd6e2ba2f26468fee1efa666a45b2fe02f.1590512905.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:40 +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: cb465673-2872-4734-9f14-08d80197b7e5 X-MS-TrafficTypeDiagnostic: HE1PR05MB3225: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3631; X-Forefront-PRVS: 041517DFAB X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cym4mFu8JB3H/Lkvuj/jrCMVi2gTobQOR/o7EB0qnLARdQuoKO3jygVWqKcW5Mv3AbWea+1TpNxZFUrPo55B4j9fBOSKFnh8YS0xEPBM/RwXalO+UZv4q+72ApQ8UStyKcoQaft+gOo8YZ5w2U6ICSGFrWgl3s7Ik1lSiM47qOFxCrC8OyuAhg6RqZLo2xGo7ChSX/2AS1Tew8wLkVvNzAr4ZO1NGAThsNde92698KPRVCF7eFdESn9Pr/xkdAJuN72v9obFaiipXAxAmBypdrcyz/LNPgBnUCEe5GIzrMjbfqi6fDHUYFDHTBIUwbiUhI5l8Q8zVJB8B+DyWDu9CA== 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: Otto/2HwD10NMt7p0u1sUkwkBRqtBc3MO06yy8XI/L+ZZcdDW+Z+xMC30XdiQz0Q2y8yQUZLEC+8n48p9VIzLMB+TCGKuhOyIb3Rq9tlrw9vKrAWiZGe3xrj7g75TCxFoyRQeWiNqop0dzpKtaygRm4JVpUe2nAY2fbUkPYnhDdAvJpjlZIYA99EUT+jUSDA0Rbo6rhhAxCMbsrW/hfy88/DPK8VkpGMVXDWH7DcqGHpTWoSAJmntsZJqzFOEKnRyn76nqBxLDjv8V+I9GyHRwRSaDjHHCMRKV9iPBTwp8dfCnXfsYZhIyXCoVjezGynYUj/K/z8JE4jM3DFL2ZSDbloVOLVgW59gjqzwlfYIYWTtPOGTo3vpQRK5K/UEss1ph/YEdlhEu645vktz1dD/73ugi7gK8B5dSs696cWTbPfpuacCmynzlM4c2K+PNb7enS7XAFv2dYmIdfn/zxvhQI9vNXc45MNozaxGV3y57s8uZlOyl4xxFLPtIdrH3WL X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: cb465673-2872-4734-9f14-08d80197b7e5 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 May 2020 17:10:41.2442 (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: P6eimp5IE0Jqa58sudr1NvaY1vUPiWvjguwL2Xy8mAKZqvMH8WdZJ4297RuxhRAZEnQz60bk1Yo50qeYd7s9Qw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR05MB3225 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The "early" qevent matches packets that have been early-dropped. The "mark" qevent matches packets that have been ECN-marked. Signed-off-by: Petr Machata --- man/man8/tc-red.8 | 18 +++++++++++++++++- tc/q_red.c | 23 ++++++++++++++++++++++- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/man/man8/tc-red.8 b/man/man8/tc-red.8 index b5aaa986..e74dd330 100644 --- a/man/man8/tc-red.8 +++ b/man/man8/tc-red.8 @@ -17,7 +17,11 @@ packets rate .B ] [ probability chance -.B ] [ adaptive ] +.B ] [ adaptive ] [ qevent early block +index +.B ] [ qevent mark block +index +.B ] .SH DESCRIPTION Random Early Detection is a classless qdisc which manages its queue size @@ -134,6 +138,18 @@ Goal of Adaptive RED is to make 'probability' dynamic value between 1% and 50% t .B (max - min) / 2 .fi +.SH QEVENTS +See tc (8) for some general notes about qevents. The RED qdisc supports the +following qevents: + +.TP +early +The associated block is executed when packets are early-dropped. This includes +non-ECT packets in ECN mode. +.TP +mark +The associated block is executed when packets are marked in ECN mode. + .SH EXAMPLE .P diff --git a/tc/q_red.c b/tc/q_red.c index 53181c82..7e7dfa05 100644 --- a/tc/q_red.c +++ b/tc/q_red.c @@ -22,6 +22,7 @@ #include "utils.h" #include "tc_util.h" +#include "tc_qevent.h" #include "tc_red.h" @@ -30,7 +31,8 @@ static void explain(void) fprintf(stderr, "Usage: ... red limit BYTES [min BYTES] [max BYTES] avpkt BYTES [burst PACKETS]\n" " [adaptive] [probability PROBABILITY] [bandwidth KBPS]\n" - " [ecn] [harddrop] [nodrop]\n"); + " [ecn] [harddrop] [nodrop]\n" + " [qevent early block IDX] [qevent mark block IDX]\n"); } #define RED_SUPPORTED_FLAGS (TC_RED_HISTORIC_FLAGS | TC_RED_NODROP) @@ -38,6 +40,14 @@ static void explain(void) static int red_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct nlmsghdr *n, const char *dev) { + struct qevent_plain qe_early = {}; + struct qevent_plain qe_mark = {}; + struct qevent_util qevents[] = { + QEVENT("early", plain, &qe_early), + QEVENT("mark", plain, &qe_mark), + {}, + }; + struct nla_bitfield32 flags_bf = { .selector = RED_SUPPORTED_FLAGS, }; @@ -109,6 +119,11 @@ static int red_parse_opt(struct qdisc_util *qu, int argc, char **argv, flags_bf.value |= TC_RED_ADAPTATIVE; } else if (strcmp(*argv, "adaptive") == 0) { flags_bf.value |= TC_RED_ADAPTATIVE; + } else if (matches(*argv, "qevent") == 0) { + NEXT_ARG(); + if (qevent_parse(qevents, &argc, &argv)) + return -1; + continue; } else if (strcmp(*argv, "help") == 0) { explain(); return -1; @@ -162,6 +177,12 @@ static int red_parse_opt(struct qdisc_util *qu, int argc, char **argv, max_P = probability * pow(2, 32); addattr_l(n, 1024, TCA_RED_MAX_P, &max_P, sizeof(max_P)); addattr_l(n, 1024, TCA_RED_FLAGS, &flags_bf, sizeof(flags_bf)); + if (qe_early.base.block_idx) + addattr32(n, 1024, TCA_RED_EARLY_BLOCK, + qe_early.base.block_idx); + if (qe_mark.base.block_idx) + addattr32(n, 1024, TCA_RED_MARK_BLOCK, + qe_mark.base.block_idx); addattr_nest_end(n, tail); return 0; }