From patchwork Fri Mar 27 17:55: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: 1262905 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=none (no SPF record) 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; 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=F9ZwykGS; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48pqKH1Wzhz9sNg for ; Sat, 28 Mar 2020 04:56:03 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727444AbgC0R4C (ORCPT ); Fri, 27 Mar 2020 13:56:02 -0400 Received: from mail-db8eur05on2063.outbound.protection.outlook.com ([40.107.20.63]:40096 "EHLO EUR05-DB8-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726959AbgC0R4B (ORCPT ); Fri, 27 Mar 2020 13:56:01 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ReRltED2POprwCqXmM9iQryMXT8udb4xLx/DswaHHDzZac+3LW85Flf/vabPYqcfhKNmc205CYIewfe1APUepUYQMKrFFs/s9/Oqpe3KNW2LWJ3myOTWQTOpi7LIvayZbkKk52yK62gTM8zcJRN3wmR23NJx0RdXMImgD7Dmn+Yq3B3pyrxo8TPmaf9svh7+bvOXmARWyuieQ2krrmI4kMGhlNspDgnMgDcsvhSKKaR4kWiGjhLO/K7Hs2fyiIfyOwmSbZ/juFK/i7wikVNSAPZ0V2QAFH7dTVGZwS8uktUSyywoWB4YrOo1tSu7335nFhhbKgM78Z85X1ImmRCd2A== 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=nCBfYHPnT/xIhsNGGAmW4YpwIBF5vCgBpsAO1lKdHg0=; b=hJ38BQkg2Kq2bqIzRzEvzqa/25DoN0CKENM8/MZu7snADML4IsGUfoZLNYOqA3l6wFCYHNhg9vgKwn2RAx9cDDNLw/0+hielfrRnXbNHj2YWPvIvEcKvze4pOekQ6kycTJuYCBgUHmngt4iPhxgL1K0mf97T9s1UMcl1qJ5TcxTx2JXZt3oTdO6YZS+veezHGoglM2u+4RJJPGfEiVXU/FcJdu70JDfTLcCmQt0BfSdLSoQMhS2LXO/i4QwtpSCYHQ0NsjxXpmE/SKscsPHcGLGTfo67nDvLcaOTml9W3TJvncz2IiDzi6WAMvSXstYhueeZ6zx8glLvbxcDif8YZQ== 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=nCBfYHPnT/xIhsNGGAmW4YpwIBF5vCgBpsAO1lKdHg0=; b=F9ZwykGSCspKmuh55ZdDol02fy+mmCofhjgaFjImazMt4kVvMVD5jryIoq21d5pGwhpbKu1AGLVsQcISlywo0Uwbni7j42xloG+RE6LwYqcQql4MD37eF4AcWZbUqD9yluc9JBXc8NW8XMzfF0h4rcRS01s3ERuQhhdlUj9Ks9A= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=petrm@mellanox.com; Received: from HE1PR05MB4746.eurprd05.prod.outlook.com (20.176.168.150) by HE1PR05MB3402.eurprd05.prod.outlook.com (10.170.244.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2856.18; Fri, 27 Mar 2020 17:55:56 +0000 Received: from HE1PR05MB4746.eurprd05.prod.outlook.com ([fe80::e9a8:7b1c:f82a:865b]) by HE1PR05MB4746.eurprd05.prod.outlook.com ([fe80::e9a8:7b1c:f82a:865b%6]) with mapi id 15.20.2835.023; Fri, 27 Mar 2020 17:55:56 +0000 From: Petr Machata To: netdev@vger.kernel.org Cc: Petr Machata , David Ahern Subject: [PATCH iproute2-next 1/3] tc: p_ip6: Support pedit of IPv6 dsfield Date: Fri, 27 Mar 2020 20:55:08 +0300 Message-Id: <628ade92d458e62f9471911d3cf8f3b193212eaa.1585331173.git.petrm@mellanox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: X-ClientProxiedBy: PR3P189CA0019.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:52::24) 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 PR3P189CA0019.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:52::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2856.19 via Frontend Transport; Fri, 27 Mar 2020 17:55:55 +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: c73360c2-c6ba-462b-5bc6-08d7d278197b X-MS-TrafficTypeDiagnostic: HE1PR05MB3402:|HE1PR05MB3402: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4714; X-Forefront-PRVS: 0355F3A3AE 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:(10009020)(4636009)(366004)(376002)(136003)(396003)(39860400002)(346002)(6916009)(26005)(2906002)(66476007)(66946007)(6506007)(8936002)(36756003)(86362001)(5660300002)(81156014)(6666004)(6512007)(66556008)(8676002)(81166006)(316002)(186003)(16526019)(2616005)(956004)(52116002)(54906003)(478600001)(4326008)(6486002); DIR:OUT; SFP:1101; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dOSqilePsnYNbkNu1HGVVKbQPF1Ss+E/nwTu0WV4XP5QPS2trWVqN3WUHJJPbgcvtcpjE859PjO90VlKWKVzt9O81dB06KsRaBFmY6jPk2oPWfcAWZndHfNLtvP5vuxLfLsmYS+za/PXmsHtbfMAE/8DzD0god5/J/TNkDENAENWP0cGWyWHNMzmDqCXuLqIi0PHP7ZrPH6+ZTcz3h4ZPU2Qu0CK1hd0G50ilGWRM0/z948Tiu4c1i1zQBvQS06tHQHhLx2FDmZMPlLsrw3eZwr6Y9Jdkfzx895Bo9dFawZmwGuqHsCpA7AfD6hYA6Vw61ZFreA1gfUkvO2l3tLtzhYee21t+K073pU7V6HmxUSeSKvkVtri363H6jFiA7+MiyVp42wbvpY3PXlk77P3y6KRPRVeyGuCQJfZwvurlN9OPIcSiKQBqlvWpQYkavCg X-MS-Exchange-AntiSpam-MessageData: 5g5DzerSliXfyH1luanDAZdi0JV9Hw7FdHOLupl+jCtSdgxLoFML92HnWZxZ0v8D4ZdvxVbDco5u4/QqwG4+b/7F4WIE8sBSjWHyE43RrICJxEjyWzBk7K+tQgM/1Zqd5jj9Mq0eur2HkD1Hz8T4Sg== X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: c73360c2-c6ba-462b-5bc6-08d7d278197b X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Mar 2020 17:55:56.4336 (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: XlDYBvAFNFbn5GXfzX15SFOK81O2Pj6UtZUJO7mw1ZJv7q9NmXNhRZbNAbBxY9pLk4+KNeDkhiE2ejf3/VzDoQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR05MB3402 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Support keywords dsfield, traffic_class and tos in the IPv6 context. Signed-off-by: Petr Machata --- man/man8/tc-pedit.8 | 14 ++++++++++++-- tc/p_ip6.c | 16 ++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/man/man8/tc-pedit.8 b/man/man8/tc-pedit.8 index bbd725c4..b44b0263 100644 --- a/man/man8/tc-pedit.8 +++ b/man/man8/tc-pedit.8 @@ -60,8 +60,8 @@ pedit - generic packet editor action .ti -8 .IR IP6HDR_FIELD " := { " -.BR src " | " dst " | " flow_lbl " | " payload_len " | " nexthdr " |" -.BR hoplimit " }" +.BR src " | " dst " | " tos " | " dsfield " | " traffic_class " | " +.BR flow_lbl " | " payload_len " | " nexthdr " |" hoplimit " }" .ti -8 .IR TCPHDR_FIELD " := { " @@ -228,6 +228,16 @@ are: .B src .TQ .B dst +.TP +.B tos +.TQ +.B dsfield +.TQ +.B traffic_class +Traffic Class, an 8-bit quantity. Because the field is shifted by 4 bits, +it is necessary to specify the full 16-bit halfword, with the actual +dsfield value sandwiched between 4-bit zeroes. +.TP .TQ .B flow_lbl .TQ diff --git a/tc/p_ip6.c b/tc/p_ip6.c index 7cc7997b..b6fe81f5 100644 --- a/tc/p_ip6.c +++ b/tc/p_ip6.c @@ -56,6 +56,22 @@ parse_ip6(int *argc_p, char ***argv_p, res = parse_cmd(&argc, &argv, 4, TU32, 0x0007ffff, sel, tkey); goto done; } + if (strcmp(*argv, "traffic_class") == 0 || + strcmp(*argv, "tos") == 0 || + strcmp(*argv, "dsfield") == 0) { + NEXT_ARG(); + tkey->off = 1; + res = parse_cmd(&argc, &argv, 1, TU32, RU8, sel, tkey); + + /* Shift the field by 4 bits on success. */ + if (!res) { + int nkeys = sel->sel.nkeys; + struct tc_pedit_key *key = &sel->sel.keys[nkeys - 1]; + key->mask = htonl(ntohl(key->mask) << 4 | 0xf); + key->val = htonl(ntohl(key->val) << 4); + } + goto done; + } if (strcmp(*argv, "payload_len") == 0) { NEXT_ARG(); tkey->off = 4; From patchwork Fri Mar 27 17:55: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: 1262906 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=none (no SPF record) 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; 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=bLKFFAuN; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48pqKK1JR5z9sNg for ; Sat, 28 Mar 2020 04:56:05 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727585AbgC0R4E (ORCPT ); Fri, 27 Mar 2020 13:56:04 -0400 Received: from mail-db8eur05on2063.outbound.protection.outlook.com ([40.107.20.63]:40096 "EHLO EUR05-DB8-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726275AbgC0R4D (ORCPT ); Fri, 27 Mar 2020 13:56:03 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UcbaHa5ugC1FY75uCTxTf+AVaECwvd8+9VyLsdIhr3308KqJpPOPB2Ne1C+kSB1uc2q+ea8QWwrvWxaV5ScDufgasgopGwGWFSNzksxxMkWjq7pudZ9sqhyhqWJhJ+HWzHuSrp7QN0olI2/Luq2O6WZxZtYSdr6fc2Vjjl8YmIZp1Mw83vzeyogd2lMTr7T0omf2/IfAbIkFecsaeO4/ZN+h+/Xcgua2bFaDa0MGFevmJNLg88FRiYXhETpsnEXoCKXfV+sr6mt+1Kg7aZ2vLULPt5L11aS9fJbLrbkBlCrVc8WwCuHDIiNWC1X/5Uuosyv2MNdiGdTJdBFMKs8iUA== 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=g3EFswhgFeayjhVqdaDwfPgi1dBerinANSep2m/avzU=; b=M2DiUsTGOo0p1IKSF5oYC4N3XjgGENufeK3DSGnSF9oQMeBFOWAMEWESU91nN4qMOxAGbfxYMNOcse9dy+/qZW7ed+mqevBR7M3ZF3n0sYC3IXN1H86+pO6Ieqsum0qbwj4qgaBFyg9M4hL/KiaGHe92kLWKfYqqrd1szHIVu9uPSQ+TkQAM7dg8eiP6NFFbHaoWWlb7uTbfVO4NohOA2giul2jkI2uVal6MHtexNX/wbP1zbyDOeiohjPzKreyQUxS+39yLR/bYxem0NBXZd3eBY2oiH5/n/al5fXaisFckZK45yYTTz5Kyekt4fUpdZmLSKKwX+ByjrYgFCmvpYw== 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=g3EFswhgFeayjhVqdaDwfPgi1dBerinANSep2m/avzU=; b=bLKFFAuN7CBv1DP2wdiYzm+/2636xh0Fy+2Dsg0wMqiE3jImPvMm7gkIZlivFBo+JVIlFWQwPcQR1OZMmUV2L4YU6juwFSKnr7JfVUhLZxW04d0pcPm7aP0bNlps8j1DqcNPEspZNa9tmJ8Oe3BisbKcQ2Rwk6zOswmU6h7xeuE= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=petrm@mellanox.com; Received: from HE1PR05MB4746.eurprd05.prod.outlook.com (20.176.168.150) by HE1PR05MB3402.eurprd05.prod.outlook.com (10.170.244.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2856.18; Fri, 27 Mar 2020 17:55:57 +0000 Received: from HE1PR05MB4746.eurprd05.prod.outlook.com ([fe80::e9a8:7b1c:f82a:865b]) by HE1PR05MB4746.eurprd05.prod.outlook.com ([fe80::e9a8:7b1c:f82a:865b%6]) with mapi id 15.20.2835.023; Fri, 27 Mar 2020 17:55:57 +0000 From: Petr Machata To: netdev@vger.kernel.org Cc: Petr Machata , David Ahern Subject: [PATCH iproute2-next 2/3] man: tc-pedit: Add examples for dsfield and retain Date: Fri, 27 Mar 2020 20:55:09 +0300 Message-Id: <837315b74b1fdfc4a08362c18f3a1544d8fe1092.1585331173.git.petrm@mellanox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: X-ClientProxiedBy: PR3P189CA0019.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:52::24) 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 PR3P189CA0019.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:52::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2856.19 via Frontend Transport; Fri, 27 Mar 2020 17:55:56 +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: 46278a22-8305-4a2a-af9f-08d7d2781a1e X-MS-TrafficTypeDiagnostic: HE1PR05MB3402:|HE1PR05MB3402: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3044; X-Forefront-PRVS: 0355F3A3AE 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:(10009020)(4636009)(366004)(376002)(136003)(396003)(39860400002)(346002)(6916009)(26005)(2906002)(66476007)(66946007)(6506007)(8936002)(36756003)(86362001)(5660300002)(81156014)(6666004)(6512007)(66556008)(8676002)(81166006)(316002)(186003)(16526019)(2616005)(956004)(52116002)(54906003)(478600001)(4326008)(6486002); DIR:OUT; SFP:1101; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JJ/21U1pX8klo97VkFdgj/8rgd7oqrGC1oeLd6D0Sg1oLPbv5NCZ4FyDoo0ohj+NpphYHcDATRz3ZN/iZN1mNsKZC2eRMX5fwvsZskCY3njY21BOogRxcEDgUnQrUz3xOvW8GxAgZB6WBNKyu9A/2yd2dp19Uqtn6TqOLswzHsCRKcDOeBsM32BjB/qkJmG1HTj7TdemUTORIxQUqGqDKzT1IzCVj5ZfEQDClfYIVDe0QOoCnXdK8zLEmUwE3p+LzCwslIvfyHmwDyI5bdywAy3yWAN4TcvKLAGyM657YDYCpes23yVI+gwvh5vMFowiF0GIpF5Dz41eMMIcNClmwfYH0r75Q8mbSZaMTJQ3C7/JdqGf9V7SEzXh4fGEDCUDBIvHbeJUVckUO6Y+RGMTgAsEMdHDXv16NHMwmXvhHrwgiSAx29ceJyR2h3XH4H/3 X-MS-Exchange-AntiSpam-MessageData: lcckmn/RxsdCqpVw3szZSwvcg0Lwo7ZHm1q5FdszmDohHVi7aGU4SxVuafZYgzUI0MfgWqsDVHLtCFTfzkMe7NZxA6RhV6MHIJgERng24Lp1+d7+CzzNofmEDoDbLqvHnhBWDskSrNyWh6nT2ttg+g== X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 46278a22-8305-4a2a-af9f-08d7d2781a1e X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Mar 2020 17:55:57.5080 (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: MdkSLElhn1sdWRHqDThpPU3l5+6jZtwKQTRby5btYPcZ4qP4gP/yu4MjS1JlsQp/Hwsw2L4fNFtWkB2n92eERQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR05MB3402 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Describe a way to update just the DSCP and just the ECN part of the dsfield. That is useful on its own, but also it shows how retain works. Signed-off-by: Petr Machata --- man/man8/tc-pedit.8 | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/man/man8/tc-pedit.8 b/man/man8/tc-pedit.8 index b44b0263..54b91d3d 100644 --- a/man/man8/tc-pedit.8 +++ b/man/man8/tc-pedit.8 @@ -377,6 +377,28 @@ tc filter add dev eth0 parent ffff: u32 \\ action pedit ex munge tcp dport set 22 .EE .RE + +To rewrite just part of a field, use the +.B retain +directive. E.g. to overwrite the DSCP part of a dsfield with $DSCP, without +touching ECN: + +.RS +.EX +tc filter add dev eth0 ingress flower ... \\ + action pedit ex munge ip dsfield set $((DSCP << 2)) retain 0xfc +.EE +.RE + +And vice versa, to set ECN to e.g. 1 without impacting DSCP: + +.RS +.EX +tc filter add dev eth0 ingress flower ... \\ + action pedit ex munge ip dsfield set 1 retain 0x3 +.EE +.RE + .SH SEE ALSO .BR tc (8), .BR tc-htb (8), From patchwork Fri Mar 27 17:55: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: 1262908 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=none (no SPF record) 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; 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=FgB8TeWv; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48pqKM3ZnLz9sSG for ; Sat, 28 Mar 2020 04:56:07 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727607AbgC0R4G (ORCPT ); Fri, 27 Mar 2020 13:56:06 -0400 Received: from mail-db8eur05on2063.outbound.protection.outlook.com ([40.107.20.63]:40096 "EHLO EUR05-DB8-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726959AbgC0R4F (ORCPT ); Fri, 27 Mar 2020 13:56:05 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cLcNX1nG+rCGBjXkR14nD18GJiog2cklJXqHWaLGBGtX8kLquGp8251dV7BF7VmFiMQqL4Yv80k3HxPqRvxex911A75e/P0tfezo1LoJE8GYaZbc25QGu2AH1rN6/nJNAndCQxgJEbMyjtyM1808pVhzpUvzT3OJQ1ETTPhtKaQVqD/nFfnhDDiZVE38p6W2P2QbXa/J9EoncgJMJUzZwbnBRKARaBFPEx9OMC0KThG9J4W3XZcp7LGvs1zk7koyUnqpAbmDBOlTJc79F/LytqA4Nl2ol7a3KpMcuoKVPL059wC3TcXG1FOIZuJ16DPf5sWqjbyCEeNoe5urPRHkBA== 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=hzXM2YeWDq2hOJayH+LpgI8Oh532EbTbaG0grV8YWqU=; b=QNf9hm0WGTpsxUxcWXV2A+mMcFkI5nNY37ePzesRd6Qm55LXEFR3IBSZdIXPlI7HTHqMCqFOfxamsSOqxT2Y4eU9JHer5YRwkb+DCYABmOPiZrpTLPxksLISpiwcDwpy8fgdTXtR21w+WnRmubaW1Y629x6A3SVIIcAQa9imJ9CtJcZuq4RZ2XIgapp5QTFUiR9YjErAKs2QDgsg6eoycRH8ECuRF4iLHFqNYPmL6maT+5Sw80c8gNhY3gLfTmr+ZY9IqIU1eijTMtNn1e89uJbLWttB5cZ0rNNyCBeoKETXxX9jDIDmGZv6Q+4dvb7OwrmalAsL6qOfn5DzPUAeUQ== 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=hzXM2YeWDq2hOJayH+LpgI8Oh532EbTbaG0grV8YWqU=; b=FgB8TeWvp8QYZwD355afsL7WdN5TLhRvSjpJ2xcbQC0hD59ubo7hipe4WUpQXDdRqi4dUo9cHuDQnJftXbkMeHQwzw/WjKi/bs7nVzgORXZqL8NDVHbwzgOVDdkNfhp2L//Xw2SwiCNJSy9f0FGqqXA89L04VHpTJxxOg0DW16s= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=petrm@mellanox.com; Received: from HE1PR05MB4746.eurprd05.prod.outlook.com (20.176.168.150) by HE1PR05MB3402.eurprd05.prod.outlook.com (10.170.244.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2856.18; Fri, 27 Mar 2020 17:55:58 +0000 Received: from HE1PR05MB4746.eurprd05.prod.outlook.com ([fe80::e9a8:7b1c:f82a:865b]) by HE1PR05MB4746.eurprd05.prod.outlook.com ([fe80::e9a8:7b1c:f82a:865b%6]) with mapi id 15.20.2835.023; Fri, 27 Mar 2020 17:55:58 +0000 From: Petr Machata To: netdev@vger.kernel.org Cc: Petr Machata , David Ahern , Ido Schimmel Subject: [PATCH iproute2-next 3/3] man: tc-pedit: Drop the claim that pedit ex is only for IPv4 Date: Fri, 27 Mar 2020 20:55:10 +0300 Message-Id: <9d1dcd1037380a57ab8b5aaaf5be9e6888fccfdb.1585331173.git.petrm@mellanox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: X-ClientProxiedBy: PR3P189CA0019.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:52::24) 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 PR3P189CA0019.EURP189.PROD.OUTLOOK.COM (2603:10a6:102:52::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2856.19 via Frontend Transport; Fri, 27 Mar 2020 17:55:57 +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: 10b3047c-b53d-4701-e043-08d7d2781ac8 X-MS-TrafficTypeDiagnostic: HE1PR05MB3402:|HE1PR05MB3402: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-Forefront-PRVS: 0355F3A3AE 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:(10009020)(4636009)(366004)(376002)(136003)(396003)(39860400002)(346002)(6916009)(26005)(2906002)(66476007)(66946007)(6506007)(8936002)(36756003)(86362001)(5660300002)(81156014)(6666004)(6512007)(66556008)(8676002)(81166006)(107886003)(316002)(186003)(16526019)(2616005)(956004)(4744005)(52116002)(54906003)(478600001)(4326008)(6486002); DIR:OUT; SFP:1101; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JDR33qGKsH8sO1Ri1RqHpEctnEYCpF3GMWPhNw7sERr7FxCZeXgqi/aDl8CeeUlAfErHnjKxMPp713gRvTf9vfqVgGd/B9sqdwbhK9yMGOz5PTPkJsBNN9Z2uh6zvts9r98vvwxv2GLeDdTqpqJqjHQlOChsmqvWWATe/rs799vxMTNt+9IQYoKxWeTzTgRtEMi9jEXkTNeG3unt1LYKrXt0QPIyXb/lV3SEFM8ohK8x6aT82a41jrhzdktIdWqIlU0sTDVNLwO7Nw4CO1m7xSNeY7hHKEqO6hVdfDYFWaE5J09TlqA8iyEJJ27ja5uhWBYVEpwKbgBAlBPfB1A6IH70YmHqwv1TwBty5FsE1bl/P+fK3IUhaheO0xnKhsTdDGUersSiOHT3B4nd+ao5TXLU1vzKn+xBMIerB2hdDqrqLtenkfJkU6YQv199/IiQ X-MS-Exchange-AntiSpam-MessageData: jQoyNn6QCB0mMEFq1jVBEWRtn0iKWsbaPcFZSBHVg7P04xot9hClTFKL3OZNP00FAvm77cFV4IbskJUCwU9P/8WBmo9Fma+SoKhm5TfDV300H0AfT9mOuFvtM9oU1euaJ2alWTOFwQWOQbt+2whqiA== X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 10b3047c-b53d-4701-e043-08d7d2781ac8 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Mar 2020 17:55:58.6213 (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: ZA3K1O4B16Krb+JmVETNVvnO4aCQrIS+9qjGlRqq3AKIzKZejcTWtkI3+DCYxYwhDTUYtZBr+aaqw0wzJovPKA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR05MB3402 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This sentence predates addition of extended pedit for IPv6 packets. Reported-by: Ido Schimmel Signed-off-by: Petr Machata --- man/man8/tc-pedit.8 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/man/man8/tc-pedit.8 b/man/man8/tc-pedit.8 index 54b91d3d..ae9f7c2e 100644 --- a/man/man8/tc-pedit.8 +++ b/man/man8/tc-pedit.8 @@ -90,8 +90,7 @@ action can be used to change arbitrary packet data. The location of data to change can either be specified by giving an offset and size as in .IR RAW_OP , or for header values by naming the header and field to edit the size is then -chosen automatically based on the header field size. Currently this is supported -only for IPv4 headers. +chosen automatically based on the header field size. .SH OPTIONS .TP .B ex