From patchwork Mon Feb 24 06:52:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 13987486 X-Patchwork-Delegate: dsahern@gmail.com Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2074.outbound.protection.outlook.com [40.107.92.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5EB27C8C7 for ; Mon, 24 Feb 2025 06:53:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.92.74 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740380017; cv=fail; b=du89wqSaM/HJnReEB0wviau5gbbREqIijBn/hMmnGA5XwNvylpFR9dEncEhn40EOnIwEpaNInqJPI1MTvC2Oakim/lATMnyPQJk5ZA3de/KydafMshscTySjgordNYjz+HmsHkjY5AbAt+ROB0HqM2E5VwF8RFCxgZnC3+ygnhc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740380017; c=relaxed/simple; bh=tly8zG4/k1WKSiKWycIet/C52NFzCNLUI5Zw9hukI9U=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=NiNTpGuIcRljbxClGybujcsA/uMGARZqngAGoisguVOdnJ6NElPGJWsiHgrKCLB/HJ8+3YYU6yXwiB7QU/HDccHCtYctJjk1MLtfg31/7v4+vPkuiOpofwHj9ZVmOUyRnK3oALLxP5+obManS3lL8AIK9qWPQ5U6IKi3vWMXyls= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=bBuKW6PQ; arc=fail smtp.client-ip=40.107.92.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="bBuKW6PQ" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=pjrGh4AqQ2sPSuUbYs8dhW1LlhT1Vqo4YgzfyRnbyrlM0+Nv/Atff6sCQKIPMA0i6WqOWNWE1875EZsPihmhz8dl7hzMCrge7QjLnJ6CLdzGWS4VgP1hFc4G/Xs5ynlPLLiBbB+ZmEH/kUy4ERNMk6L2IzpDz7Sg+g+Kd/8hEEZpP811dD2Rs+36RcIplVWbskemvRj9pHQ/v2Fy/rK+vlROjvFxcikPvvqoB42v9eQspZqbBDBgR5z/k90LHSswYXZKJV9AY+buBK6C+c2GI2b8cX4XVwl2hcclBVaqmebpmQuqIhZ8JSarH8Pr52I/FhypJOvhbazL97CX2wW+cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=KvkfJmuxTCIG06rZCADtd5h+Yhz6gSrhaYRvZLv7NSc=; b=HSnEt7c5MCbgCA/DPWuTxdWCH8F7rSFO43S7UPXGk3EI7xg4Wi/LULLWdujNSom3AhNFw0sDfcVsDF8JlP3/MJZcy3mvT1L9T1lnfxUZkY+/jyO5guylFZ5eHjRRfFhkM33Lq2zIEBNhD8Jn4tMatvohb01WE9jTrF5rwGTos9MI1UAu6oVvAAdsshT4PxnJrtrvM4Nogptmw5g6ly5a64mRuBCaA2S1bCZcFiF+/PcHWuXKGwqJK2ynXIDyst0HYnL/R0FQtnHN5oUEhAPuADfljb23jO6qXYTCUxNrafZT3meuNadT99UpA6k3tfTY6frnixefWwPXRbDF0ZZ0jg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KvkfJmuxTCIG06rZCADtd5h+Yhz6gSrhaYRvZLv7NSc=; b=bBuKW6PQzF6d4x1I5J5yaQXMI5YMrdFrwU/N9g2gg84aB0pqloj+DjNijeTY+F6xRFqOkWgAC6bsNKhlnC4APZLQXWnYJoyy0zgivAPRqJiZmlsGHLlxEGXQKjxfjqeoBZFHkV1IGU+UGCG9rntm59FCCgmyxfIz1uO+sSfZLe22KnM6P/CrRdbgH2Gwyr6ddBJcwCo30hrGMxMOgx8Z1uo8X0119DFtFU5QnDh0JjYbEi7PvpXdYdg4ifv3bRgnJdsvly2wTVYb8iMiUFzTSD7KZ1Wx5sSErvGMp9jGzOJPe3JeMixYPWxi7bCSvR+tK0/d8fmaHGZpufj7Uk4UjQ== Received: from BL6PEPF00016413.NAMP222.PROD.OUTLOOK.COM (2603:10b6:22e:400:0:1004:0:b) by CH2PR12MB4231.namprd12.prod.outlook.com (2603:10b6:610:7d::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.19; Mon, 24 Feb 2025 06:53:27 +0000 Received: from BN3PEPF0000B36F.namprd21.prod.outlook.com (2a01:111:f403:c803::) by BL6PEPF00016413.outlook.office365.com (2603:1036:903:4::a) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8466.17 via Frontend Transport; Mon, 24 Feb 2025 06:53:27 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by BN3PEPF0000B36F.mail.protection.outlook.com (10.167.243.166) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.0 via Frontend Transport; Mon, 24 Feb 2025 06:53:26 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sun, 23 Feb 2025 22:53:17 -0800 Received: from shredder.nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Sun, 23 Feb 2025 22:53:15 -0800 From: Ido Schimmel To: CC: , , , , Ido Schimmel Subject: [PATCH iproute2-next 1/5] Sync uAPI headers Date: Mon, 24 Feb 2025 08:52:36 +0200 Message-ID: <20250224065241.236141-2-idosch@nvidia.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250224065241.236141-1-idosch@nvidia.com> References: <20250224065241.236141-1-idosch@nvidia.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN3PEPF0000B36F:EE_|CH2PR12MB4231:EE_ X-MS-Office365-Filtering-Correlation-Id: a573b351-2430-4c6c-b1da-08dd549ff0a8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|82310400026|36860700013; X-Microsoft-Antispam-Message-Info: bbnYo3d3Ashr6wHXqy1gE+SnLgY/y/shB1S3GHOdBpIDt5v+YSL3lt75ulAH3HjJk9M6WcKbR/3ZfNYR5vROxJ+UipZ0PFN0FkuYfE3p+ZgFCEZSSlFuUnNfssGxyw7TaiO+8erEPEh0L/vPesJ/B6FtOepA/Q2XTGeqg+FPWFXLCHQSHd/oHthjmRnh2qMm65OSir6YQeqN1j7UP4DapjpMQMs3f7tyPsole62/IrKrzq4+wxNL2Ol78R3lUhCayamZ1ljY2ahCY3rTdCH6xna3s+psW8fnJl5paPZvBk4VepFCmY1DNvVPcjwiN7f2UNP759+YyFWYe0k4XERS+3fDduixQ2YkGmYXo/YoYqLBncV9OQhFYRdBYmFGayqEO+WpMlaxNf08o2y6L1IJCNdF6PgEozKVKogdbLfLUGA9THB9aZ+kCcVaT+Poi7f5Kfgha5hhGHyr1l3+wbS6oMv+jMLu84/nPoziNDnhq7ChzhsWTZqaX4id9HJ4Dx0q4drCUqV8gwUQ3Heux4Sz+n9YpFR3lIt3sdRZ6gCU7nIZSxc99o7OZhiHYR3QVqfAfp5GRVUuWxf3MHgWR6+CPQaZop1viBpDYcaWdGmhKBLNvddQQiIKU/iR2oJofxiL6CjjDbWyTCs0/f9n55cV6XSHy6jy+zoyEQqEsirEJsorOa68JWB9BifXWK2Flvzdwujur/w58+JW4ZgJYedQm2maWK/29Aklvt3S/JIimBIfR3NXIqd86pDYIsXVL8r8N3Qb+W2TTsNUHT+Abxah935/7xRgdCMoOXQI7jRxkuZT1w7ix8nxpFPaXqvI4va2Dhwsw2X8WDVSioPLJNtLMnzdraTRVwknQvUMe3k4DFDwvL0t5pCODrswxpbJNVWVDi+QY+zme1co+/DB1WqwFTsJ1JRZtsOD1lE4QeaBp0OSzn3SIUnVGy5nJsSEMAX9QrtEuwILry6JSYnGnMTyvGhVqS/8ArOcEqG3DqMSeIVx5YdkkLyGFM5jljaMtrU3nRWLBluX2/bmZfrPw3XsBKvtHpZ8IWs46Uct1wZCWjbL7ZZBP8u/BQu/fcpzP04JQRLcLBIl674t4c9E19QdeGN+3YeECRhAZgezMgUi02ncRArsnl5REyfip73G+JOcG4kheu0OyF04i19E7aSoVsfD03Poqt1xWIYwohaUN62+il53ZkdRVJx2CyocqZG2n5YeMt/3wUgmK05mzYGrQ+sx/6jDkD/er3ms+jOc7oxlZyTXnIuTgtzBreiguheOHGezOKApEHG0mMX6tqXljgPd0gPDkajHA2G/vmDF0/FrmYGLpn9QdtcCYcqoRYaSMWHqNl90kgMYbE+pTEyHeKNkVwLYPgQ1N8Wabr2QYOAL86zsPkE4I2Ukoq/BFMhY16XjyOkB2UGzKGUxVaBj7bQWz44XhDBUFTqwudqHLaTAj80afNCcNIY3BBp917Mrg1xckO9MslrLife1fJef3z2LGh4j1p884aH/0Pxde0c= X-Forefront-Antispam-Report: CIP:216.228.117.161;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge2.nvidia.com;CAT:NONE;SFS:(13230040)(376014)(1800799024)(82310400026)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Feb 2025 06:53:26.8567 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a573b351-2430-4c6c-b1da-08dd549ff0a8 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.161];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN3PEPF0000B36F.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4231 X-Patchwork-Delegate: dsahern@gmail.com Signed-off-by: Ido Schimmel --- include/uapi/linux/fib_rules.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/uapi/linux/fib_rules.h b/include/uapi/linux/fib_rules.h index 00e9890ca3c0..2df6e4035d50 100644 --- a/include/uapi/linux/fib_rules.h +++ b/include/uapi/linux/fib_rules.h @@ -70,6 +70,9 @@ enum { FRA_DSCP, /* dscp */ FRA_FLOWLABEL, /* flowlabel */ FRA_FLOWLABEL_MASK, /* flowlabel mask */ + FRA_SPORT_MASK, /* sport mask */ + FRA_DPORT_MASK, /* dport mask */ + FRA_DSCP_MASK, /* dscp mask */ __FRA_MAX }; From patchwork Mon Feb 24 06:52:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 13987487 X-Patchwork-Delegate: dsahern@gmail.com Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2076.outbound.protection.outlook.com [40.107.243.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 311EE207E08 for ; Mon, 24 Feb 2025 06:53:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.243.76 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740380018; cv=fail; b=bV/8SqIDGe5XXgz+kBX17Mzh/SUOPlRfOOwbcwb+NOasICAOpvTGRwXgH2DgBhDSEynL/rim9Nhl3MYxoIscSqX5W4GTso1Dlai/A6NkpOb8Sf8pZ5YNO6FSnIo5rcsdM8ipm/L6XoA/n3tSFZ4UmCJ0sVx7lKJKuwNz2zQOFVY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740380018; c=relaxed/simple; bh=sMUHSMYllZc2m5zwIz1Y53ZtMxw+dJrdh4/kyyQIm7U=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=DyTdBL0lZ4GVGgPZxk0FHhvSG9kqWRz0FuLjMZgaXkBajyTezUQyBGqM/GwHNwYI6R7nScvwupOwSD/86hgzbWJcwFW0eQPKe80QETMMQE1VKjcJladjvWiEBznUMzG+pcFect1KPR1Na2Texxh11m9vbJJ42i64JP1yWrOl7qQ= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=joup7owb; arc=fail smtp.client-ip=40.107.243.76 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="joup7owb" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=AagHltkaCn2IT9GIaNHmrFBapjROiyrKaaVVst+sd5CwbINVlzm0BP62FNfdP4ZoTfjMMsCFSNMt7D0qGB2YzbKcRH6DKUHfUO4qBxcjjRAeeMmiZ2tSdIqurd++ZyhVg21Ny1/0LfW0CTs63eTas7VBIqlWpRM7WsdQZY/D2EVWRPs72MsE2xeh04OMlbYZVUQmEKCNmFGY3y6lWT6sVDGjXC7RkoMHElCF0/e1pQlnU0Vangdh+tYYrbsu8JMA9Y0QmcUlA9TNNdzrsrX9fKt5TW6GyQ+N6Es+ze7CD04V9mVszCEn+ttTzm9N3uKQN4aDzQq7WvYcl5NWtOS7YQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=eXV5aj/C8gnZUTtSeeVTH27Ityi2rqnRP6i0xW4Ypkg=; b=q9MVodoSMYJ4Dl/sh9xErkM0EKrLI8gd7zT+7IC1DYm0DH7T6xdGm7C+NEEsiMaWOXGRyf2nksu4wnXeO6P81+6kTfMZFDm3H9LYE5KwSrcxPeNENiM3WrPTvQyf6GcrFIG93pMha1CHhfp9gSLAOF/yI6TrmmwrFeckZE1PWf1Vq36sQ4DTSuoLFqqODh/jDNLhxOi9oUMC++DnpqIQNE2RdUuI8WZtip2uzyp8EBaLiOKBo5OWoQQiYi/eb6Zs30avBuN/2ffquniPNCIOxn7DT6Az9SVUlZoKgzy3cjHjFVuwSMpGO8FqtPYYLAL0Bd5RdNXjJOpaS7xanw9z2w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=eXV5aj/C8gnZUTtSeeVTH27Ityi2rqnRP6i0xW4Ypkg=; b=joup7owbNVzcu73Ymh4Rr2obdVP/0Al/Bh/In7pAq3BA7vOyiOXlWWzKBIGVWA2jUZpLvJySJczwXZ1ytPiXWGJg63bd168tlaM2DqUKG7LzCPzBMpuon9yVa6VZaFHbs7ils2azKLrPfLUh0Lwtiiv23CatejMItuc+MbZDZp/IQgAhYWgIwxa8Iy3R2ykQUgUOhoFeJOlV9P1P4hyLGQ7IfYbTdIvDtGyEsXjN7PL1d1qG9rxGV3VE+SrI2KUh71a2F1EkVZJ90AReOdT1WiN/mOdaL7JzmnTuKGzN2BMFYtHkSPzCiVW0NJLdJMGYASb/fWLxd1AL5i/fBBXn/Q== Received: from CH2PR18CA0014.namprd18.prod.outlook.com (2603:10b6:610:4f::24) by DS0PR12MB7679.namprd12.prod.outlook.com (2603:10b6:8:134::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.19; Mon, 24 Feb 2025 06:53:30 +0000 Received: from DS3PEPF0000C37E.namprd04.prod.outlook.com (2603:10b6:610:4f:cafe::24) by CH2PR18CA0014.outlook.office365.com (2603:10b6:610:4f::24) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8466.20 via Frontend Transport; Mon, 24 Feb 2025 06:53:29 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by DS3PEPF0000C37E.mail.protection.outlook.com (10.167.23.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.16 via Frontend Transport; Mon, 24 Feb 2025 06:53:29 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sun, 23 Feb 2025 22:53:19 -0800 Received: from shredder.nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Sun, 23 Feb 2025 22:53:17 -0800 From: Ido Schimmel To: CC: , , , , Ido Schimmel Subject: [PATCH iproute2-next 2/5] iprule: Move port parsing to a function Date: Mon, 24 Feb 2025 08:52:37 +0200 Message-ID: <20250224065241.236141-3-idosch@nvidia.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250224065241.236141-1-idosch@nvidia.com> References: <20250224065241.236141-1-idosch@nvidia.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS3PEPF0000C37E:EE_|DS0PR12MB7679:EE_ X-MS-Office365-Filtering-Correlation-Id: d3c167a0-0be5-4956-53b0-08dd549ff260 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|82310400026|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: +9Ce4HwZ8lBQOA0ZVzJo5nwpcqJjNlH82Msy7g2+vTsg5MYiyVT9mP6rdOR7/oAT1OeBriCromVkmTfbeTB/gKnm5YIRrvIvdcFLWWn/5xYnWanjyF9mgdbNe41BlGDm+ypmIce2sL6yJdnBLvo/ofJcqgvXa8SIPTh/Aky1kK7cCofq6K/aAVmsTHwPTUnR+7+UoXvC6dXNCcndeGSbZfZWZb7JVc7RKPV/LVTwKm3j4W50rxHp0fF86mbmRYzITaUEnr5dqJu3PkZHQwU5IPCEQ9ut1caqyOZu/53RNFauSga6HfaI4DBkalPjwNw7JX7bf//H5kaOrgOnEvQOt8/kSrOv6NBqQdSJHs7W946YXxGRCWM5ZOY+FchwmdQ3hzyUPjP092WhEanJ1ToLd+sqFfofhRzVfCVvApGItMsWRPYkHuGXfUucn08Ov4+I3yTIK0Rn69OmgzWaJmwTtO0Sf5lZJSHHy3N5ad8HM7CHL+ulos/N6cJPJAyoM5XmlpzNueiM3kUaDyMtPlZ8ayP7U+DohV4OXHS8DMZHK07qm8pQqAqaTHPM3DioCz4pqWPXOjf2iPxmv5hrMO3tIKTluk+ITVokoQrmeE4415qOMaZaI81MaGJr1faasayULGQsGUOPC2po6uRZ8pc6MqZWjfR2CosWtXC+LhVH5MGahWKPcgxfmz0e1VFr8qte1huw5otX+D/er00OIioAmWBt4gjXkLsnr6darKWRpNBojUbpiozIDXIZUvESxh/wQcu6IZCK0Gj9Jyz8tAWWTcXZY9m0ASi0t8yOCX2hd//QecZVeWis7DrKPKWehwnhOYk/6kbapK7uAs57wAIwmDICIq6wbT4i1RRB7wFTB/yDKEdJScEaLfxJZl9iUGFCLCSUJU0RpgOu4rceu7MiQorNm66UibwMRHCEBLaUXzobmdODCYCRQ2SUzpfStYNraSin0TtjoPPjV6gL5lEicTPDT4y3pAJSCFrlPJFDLbKJrHnSPqlNCafl/yuK7zkgI52DOsaK5Z2dFJim3zZhvRrZnOCuVZsYPwACaiS66VrVkJgTEJbiBulv7tcpuW6bKkUtsQoCOw+8KNOWIeKiugxZxeSLaV9l/KqslKnp/xx7m52UfK4v21Qu/HcfNGAE0RbXk75O8+KSx2bwk1UMsWv5PloaO9k8YoDpq/GT1bMdfLe2AQ77stNIRYMX+zBsolJfD3pE79jY7Sm3vjCg4yILy0YKB+H0Oo8g2qOi2jbuOAuc7/Q74nCWP2nIUbahXAQcC1MxrkexL/SaQb0lHPJ/Ez44Ee3seEdKmoG6mOtoGGTiLPkbfqrAVyQKDz19IWNN++nrxHazXrsl2HisgKsblarxkdCQZVbz4j/cJJhdarD7IrsttIQjd/MoOOHb5CIPk0wDSDv1OHhm8bQTyynAanp6raRLuJS27KUXMwx0FbM98ocjJ7Gu/pN7m/WoIduKPrkEg/vAt7mooBE+QE7veHu4y1bpJyVA4UoX8QY= X-Forefront-Antispam-Report: CIP:216.228.117.160;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge1.nvidia.com;CAT:NONE;SFS:(13230040)(376014)(82310400026)(1800799024)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Feb 2025 06:53:29.7692 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d3c167a0-0be5-4956-53b0-08dd549ff260 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.160];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DS3PEPF0000C37E.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB7679 X-Patchwork-Delegate: dsahern@gmail.com In preparation for adding port mask support, move port parsing to a function. Signed-off-by: Ido Schimmel --- ip/iprule.c | 57 +++++++++++++++++++++++++---------------------------- 1 file changed, 27 insertions(+), 30 deletions(-) diff --git a/ip/iprule.c b/ip/iprule.c index ea30d418712c..61e092bc5693 100644 --- a/ip/iprule.c +++ b/ip/iprule.c @@ -600,6 +600,29 @@ static int flush_rule(struct nlmsghdr *n, void *arg) return 0; } +static void iprule_port_parse(char *arg, struct fib_rule_port_range *r) +{ + char *sep; + + sep = strchr(arg, '-'); + if (sep) { + *sep = '\0'; + + if (get_u16(&r->start, arg, 10)) + invarg("invalid port range start", arg); + + if (get_u16(&r->end, sep + 1, 10)) + invarg("invalid port range end", sep + 1); + + return; + } + + if (get_u16(&r->start, arg, 10)) + invarg("invalid port", arg); + + r->end = r->start; +} + static void iprule_flowlabel_parse(char *arg, __u32 *flowlabel, __u32 *flowlabel_mask) { @@ -746,27 +769,11 @@ static int iprule_list_flush_or_save(int argc, char **argv, int action) invarg("Invalid \"ipproto\" value\n", *argv); filter.ipproto = ipproto; } else if (strcmp(*argv, "sport") == 0) { - struct fib_rule_port_range r; - int ret; - NEXT_ARG(); - ret = sscanf(*argv, "%hu-%hu", &r.start, &r.end); - if (ret == 1) - r.end = r.start; - else if (ret != 2) - invarg("invalid port range\n", *argv); - filter.sport = r; + iprule_port_parse(*argv, &filter.sport); } else if (strcmp(*argv, "dport") == 0) { - struct fib_rule_port_range r; - int ret; - NEXT_ARG(); - ret = sscanf(*argv, "%hu-%hu", &r.start, &r.end); - if (ret == 1) - r.end = r.start; - else if (ret != 2) - invarg("invalid dport range\n", *argv); - filter.dport = r; + iprule_port_parse(*argv, &filter.dport); } else if (strcmp(*argv, "dscp") == 0) { __u32 dscp; @@ -1036,26 +1043,16 @@ static int iprule_modify(int cmd, int argc, char **argv) addattr8(&req.n, sizeof(req), FRA_IP_PROTO, ipproto); } else if (strcmp(*argv, "sport") == 0) { struct fib_rule_port_range r; - int ret = 0; NEXT_ARG(); - ret = sscanf(*argv, "%hu-%hu", &r.start, &r.end); - if (ret == 1) - r.end = r.start; - else if (ret != 2) - invarg("invalid port range\n", *argv); + iprule_port_parse(*argv, &r); addattr_l(&req.n, sizeof(req), FRA_SPORT_RANGE, &r, sizeof(r)); } else if (strcmp(*argv, "dport") == 0) { struct fib_rule_port_range r; - int ret = 0; NEXT_ARG(); - ret = sscanf(*argv, "%hu-%hu", &r.start, &r.end); - if (ret == 1) - r.end = r.start; - else if (ret != 2) - invarg("invalid dport range\n", *argv); + iprule_port_parse(*argv, &r); addattr_l(&req.n, sizeof(req), FRA_DPORT_RANGE, &r, sizeof(r)); } else if (strcmp(*argv, "dscp") == 0) { From patchwork Mon Feb 24 06:52:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 13987490 X-Patchwork-Delegate: dsahern@gmail.com Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2041.outbound.protection.outlook.com [40.107.244.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D3C6823F42A for ; Mon, 24 Feb 2025 06:53:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.244.41 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740380025; cv=fail; b=kkm+Q3Ib3Fxa1IPOCVjv6xz26cGHAJO7ivJ94/QgwSzdCoG8vm7AoPIS2qKWJMF7TQtzy9Jvu97D4OJ5F0Jxa7JtgJiY9DMCNQwlfKuJg84938P2xieqpqKBoYV0zlk0a462LctNn8lo7Z/ksbI+QC1lLt6/s6HIAwE/q8x2N68= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740380025; c=relaxed/simple; bh=GdR2t4DVcZQtrn2Gzs0HcCwAp2+ApKYSjLMuEsjQolc=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Er/oUfrOKSSpkTzkbl4EvhquSRiZnCZvkyQkdntVyoA8iz57T55eu5zPa2om1Z019Cxpp5WcstCAS86GSR7cjV17lRu2xHq9NupzaWAbi+YGfZCU4MKr43XQqaEN/r4xC3zQ3q1FYOvwZBprHlf6TUdQkvHd3Ut+LZd0IeYrun4= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=mwI/x5v6; arc=fail smtp.client-ip=40.107.244.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="mwI/x5v6" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=i5F9EDs1Lx6/etub/bTwCo6S+xEiX4xMfobCGDZ6LgIQ58ZsJxXGrFSD9mPgjhURFBu3juyYORs8vnV1z0xyN8bMH6UQO70e/dgVgb46w4IgeRfzKPyg7jaGV24Set3CTUuNPBHiHhLStz3ZaHQBh3aNl8nesuyXBRJ+RdBT+o3MFEwwYmZPNBNuHr3jWryELSs8yDARMFaSY0+1gtgF1TT9DyMjsQzlS60sDMwXNU8qAi82x7dSKlGJlOBwXoc/1vzw9PeMxOb3OOalv0M9SxB+cBLwFj1I+lsQWitvpC3Eo8aGXontARhrwivNcvJf3LQF15Zrg20461k9ljCqJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=CRu42XQcDEEOOr/Ocxc0TXQicsSkUMq1VNw3xiVoPeo=; b=sol6gNisiQl/HsoIyhUdpPncZ1cvvUFnXyYzsOsvDkYT0b415r0KOK6pmsE+u7EuKBZBO//jS8BXEjGBTN0Rs0rUZ39l54Na8ZdewFCmv77GMQ94DDt7NCZE6bko9zRXukMX9LGs4LYlvB5FqExJqwP+V7PZdGcj2bZpXgsCQ/E2N/Dwo9psvMPF8Pj3f3sPu7m2GJxl5jwW6UGXfXFF5pdEY2lRwIo/43Vex3UBBFvInvru6Wknyd1NqfOqG2iaYomwk+ZzVMpg55QOpZNGnyU8ik4Y6JCoERT3A/QXzHDiXOhgH3OfqoP5KOMIplgx2fl0ywQKPA+Peg+wCC5SHA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=CRu42XQcDEEOOr/Ocxc0TXQicsSkUMq1VNw3xiVoPeo=; b=mwI/x5v6rNo8oCliqq40MYJXBG97PrW3TOIdP968oP+Q28/BC+3kGSbzac8plOTQQ+ChokieHyKEX634PYVKUvhlTk7Td11Pc1fKoV6zu/ESNT46g/rUlIyqzoDBfnhZ2T7Y2hu94FVUwpeAHGt6km6+KZZVVygAV3UJIRAu7lcMw2BXAOntQJjJpdezcxS8WeLegp6qurnAG1rC/TSf0PcB/jz+MJXG2DQI0OS0pZbOHrfa7znZlYm6EzErkHpMuXexzy6FfYtuA7msJsxl3z7KYr+rnJAika+ingQZK37NlRek3vZDkk0eWqMuf1UObkiKaheYE0JTWFeAzLhD0A== Received: from BL6PEPF00016417.NAMP222.PROD.OUTLOOK.COM (2603:10b6:22e:400:0:1004:0:5) by SJ1PR12MB6217.namprd12.prod.outlook.com (2603:10b6:a03:458::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.19; Mon, 24 Feb 2025 06:53:35 +0000 Received: from BN3PEPF0000B36F.namprd21.prod.outlook.com (2a01:111:f403:c803::) by BL6PEPF00016417.outlook.office365.com (2603:1036:903:4::a) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8466.17 via Frontend Transport; Mon, 24 Feb 2025 06:53:35 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by BN3PEPF0000B36F.mail.protection.outlook.com (10.167.243.166) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.0 via Frontend Transport; Mon, 24 Feb 2025 06:53:34 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sun, 23 Feb 2025 22:53:21 -0800 Received: from shredder.nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Sun, 23 Feb 2025 22:53:19 -0800 From: Ido Schimmel To: CC: , , , , Ido Schimmel Subject: [PATCH iproute2-next 3/5] iprule: Allow specifying ports in hexadecimal notation Date: Mon, 24 Feb 2025 08:52:38 +0200 Message-ID: <20250224065241.236141-4-idosch@nvidia.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250224065241.236141-1-idosch@nvidia.com> References: <20250224065241.236141-1-idosch@nvidia.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN3PEPF0000B36F:EE_|SJ1PR12MB6217:EE_ X-MS-Office365-Filtering-Correlation-Id: 3b876289-cf64-44b7-c3e9-08dd549ff56f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|82310400026|1800799024|376014; X-Microsoft-Antispam-Message-Info: HxsQ9IObTXbPacCLFG6elsi8V2qwsy64MflAaEoAwt/2Oa57hd/HZKMVpdALuTMs71A8afrJIPmLAB09XnYuMWcjnPRIUWshyczqPmxCDgPWzinrdYCIWRxWBXbulf32pOur8qCQ40t1j6Eeh+Ssada7h/JXJt1JlogmPNsltK2/RXIZWM2g5viPU7RdDH0xhAS/PZyCgp2pXjKCgcPKMAEJoIhbwN1eY8VqCyB5pOf9z3pIdpLldT8/MIZ4vENs5CTW8ULUnS7TDWnYpS/kVqWc/Oy19bPjLzfJXo2kfx+vToQhzXX6s6j63p6MJ0rim/Ti8ZqTJOCYv9MDmAP4zXBT+o56zBBeef3Iw+2spAbKWNJzTKHwTjYdiy6qxOd0/g98QvCssWkJk8kS2RVdD0nUpMFc8wJsf9xcDk3m4VXNt4KwQitUZ2Upv3vDCJMTfBly0j8GYepk4Nj8TCgIP2GiIOvbvzjUuHPPNbx6C0+2V0QCwV+L79Bbt0Se5M7gJpoyGWmtiYHxGn1b7aryRVVcQfZOSkOJharGbwty36d17lOKd9/s5e+Tl6EtkY89sFwmgNJ2Z3aUZsmj1NnyBpEgvB/4/eEQb2irpznhui/9FXP0o6Ft0QytpnQAOYMSV0PNiF5mSNhbnP8KR3XpVGk6vmvZAdzUM3791JMHsTJhjBgse44Rjk/gvn0E5kiuHZ9YhShdHW24UcLSh93iong5zfhk9pGStRHgxUv0zbJ1LR6Nr6FZlNdGrgs0yM5+6hqjz3hcs8uIAyOFh87wU642U5vKEex9vdyt3SqpprIXwykGpXcCQnHJDYXzDZ7E/eU4cDgmWGt2BJdnvFCTgksygwKPj9m8/uObh9xscpXaktDx4CgiDcAKhoDi7Ti01hMVCGlnG8R0BnaqM37nPvKCBh+D7NYpbCDNXuwYKxkx6HzgFxxMA7GNLed3EsEBIjfzAF4CORgKc8IIKWTSf1c679fRm325sI4uyD1bikNn6yVDVG9iRJU9Ce7RPQdUjF8T2dJgRXuubasB+pS65eHVEKwo3zhpAb40enBRl8qEgAa005a8Qdu0oy4scJIg/Nml3NHSKhFlCrh8a4hyxE8CkbzpuhICsiOdvviRVtJp5jrANu8AzdezN5+qW+uSe7qWJbDrjyQuqYfmSkI/ximCYYOnDytALhf4u0vFer4TVOid9HcgqE1xa99lDl1PJzIkqmXjKXVWoBbHWGIa2wi3B+P5S7K0DApC+jI4N7YEv7IduSxlrzUxjAdIWpRMtwNaBN0Qyy+5wq5PkuRIvEytYxFhEKyAJoYLMkrAGtCWMgrqTQeA0rHGdMJjs8GeZ6kHA7CHt3N808SWqoFI5cJ8kp7MbBhOXk+QUzX+0hFsJ/yNmKUK6kVMi3CW/lSmbVwXuNSDhwfm6W6bi8dx+/yFbWQBIUpi33aReNDwZUBJo+JlCQvxlsdFyRXTY5KP5JPebIarb4fdI695VsYkBjktZCbhsMgPVoVsFvdPvNQ= X-Forefront-Antispam-Report: CIP:216.228.117.161;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge2.nvidia.com;CAT:NONE;SFS:(13230040)(36860700013)(82310400026)(1800799024)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Feb 2025 06:53:34.8723 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3b876289-cf64-44b7-c3e9-08dd549ff56f X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.161];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN3PEPF0000B36F.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ1PR12MB6217 X-Patchwork-Delegate: dsahern@gmail.com This will be useful when enabling port masks in the next patch. Before: # ip rule add sport 0x1 table 100 Invalid "sport" After: # ip rule add sport 0x1 table 100 $ ip rule show sport 0x1 32765: from all sport 1 lookup 100 Signed-off-by: Ido Schimmel --- ip/iprule.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ip/iprule.c b/ip/iprule.c index 61e092bc5693..64d389bebb76 100644 --- a/ip/iprule.c +++ b/ip/iprule.c @@ -608,16 +608,16 @@ static void iprule_port_parse(char *arg, struct fib_rule_port_range *r) if (sep) { *sep = '\0'; - if (get_u16(&r->start, arg, 10)) + if (get_u16(&r->start, arg, 0)) invarg("invalid port range start", arg); - if (get_u16(&r->end, sep + 1, 10)) + if (get_u16(&r->end, sep + 1, 0)) invarg("invalid port range end", sep + 1); return; } - if (get_u16(&r->start, arg, 10)) + if (get_u16(&r->start, arg, 0)) invarg("invalid port", arg); r->end = r->start; From patchwork Mon Feb 24 06:52:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 13987489 X-Patchwork-Delegate: dsahern@gmail.com Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2083.outbound.protection.outlook.com [40.107.100.83]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CDF201C7009 for ; Mon, 24 Feb 2025 06:53:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.100.83 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740380024; cv=fail; b=HUHPBDDyqSyhzFCNpwvde8lX0S2vrUmGhSFQltOZO1gtlQh25VvQ91HeFqqgasDeApbwxiyA0BX69nWaAEGWZpsuEVE8494xLGXur/K0oRgzcQw3nyCEEkzkP3fyh1WXQvEumQjVipVlpvn67zCh8a0WWG4/26mCxGQxZtn9vO0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740380024; c=relaxed/simple; bh=onXKdqAJCppFXrjmikuJOjLqCGYjnrupK7SCeHf0Mmo=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=W5SgnpQhwZXgGhiZTe+DJszbf1QCzYvFBJJFIJ+NZ8+7A5y58X3xp4xIEDMLy+ZsXrlFNK5/8M8A6ZssdRclWFlY5fQg1kxumYaLACsiukqd39OdfjZh5kHfxGzj2zuT7WUkMS0OuvtOa/1sfLPuqIlwDpurqz2U+YiTWljpMYU= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=mSaNLWEY; arc=fail smtp.client-ip=40.107.100.83 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="mSaNLWEY" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=M8WooEV8NkZSiRf2bC77+PmrrT01Hfiar+zmCFA7NIHP4Ft2ym51VyhE0jpckolcDT/e6bBEdiNTRkWruTmoWei54P49ojw44D7s7g9SNHqXCTKLhgyLMRLBSIC+mcyDud6ko0N3a2fPDhSguYSDmLqnh90nu/ZiuXRUr5mg0cETC9aEo21NCQngdHTf+BPtO+GAxVEfHgApcb1ZlaocuYIAIi7FBmYx0TqSiLdaSTIT9guVYS4jKoH1p47ZV0/sdZ94R1yCSrc0iHvzbnyikvGb+ke2NU42sDIo9epIycmE/IYYE8I2+clZzpj6iHF2TmMS3VqzsKeaS335d0dfBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=sBAOq35ipO0L8n7kk5ISuVlFnjbyDIU5bKAFOeeb8XU=; b=OuHpI7WTo9aOqpOXTq7PbSkG/2f4TbU+Wf5m3ZoWcmbpEinNi7g+PyvO0zrES7s72lcSHeYOohIW+gzstBsxK9R6ZDM3e/ah5MkJRq3a52utZFjr36QPj9qfQYkGK2PgBypcb+Q+K5cQieUZMr0AeBqCc+yu2rDBqShz1yYw/bSB7wTHVbh+Nnbo5vJsXM88Kd9XqAUDvezX4nqResPtvctf4WoGjC+gtti3zu5OQ4hCnDPcDFhHg4dke5IqvfJ2twkgDxt0FXeLcW44a2MXnfnph7IiWfTcSzcVdFUMz6svEGuLldb8DesiH6GXkvn6dU3X0nAkTgT9EpQXBidp8w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sBAOq35ipO0L8n7kk5ISuVlFnjbyDIU5bKAFOeeb8XU=; b=mSaNLWEYcr/vTRhtGb1QVoOok5DpYQ0+1XZ/Yl63ZPzUdKxbr/uvqtGUdeH+MYdaRNk9+/9Cyq97yPEGus1uEYql7ZUPyAS+86usCxsDWURdsBoPdmZ9yQKw/f6E8/M134bCLIRZ4nobiuaB1yTzChe60sVcZM9IoBdJhKRony0y2HdMhF6NQ1d8Ok7sF8W6GzoJqe+pRNOYFTFO4t9f3LbIZ2vlY+InoyjR4zjSRccoDNseyVE/lJ+xSeN9t5SmAY8Bz3WJPaUNT0/HH1JHJGoEgdhJe6cpVGRk8blBn4XJSr8ZQlLpuFvM0nZRs2jCYuPWHd/vBwKpHKEX+Y03Uw== Received: from DM6PR14CA0063.namprd14.prod.outlook.com (2603:10b6:5:18f::40) by SA3PR12MB7951.namprd12.prod.outlook.com (2603:10b6:806:318::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.19; Mon, 24 Feb 2025 06:53:34 +0000 Received: from DS3PEPF0000C37A.namprd04.prod.outlook.com (2603:10b6:5:18f:cafe::7a) by DM6PR14CA0063.outlook.office365.com (2603:10b6:5:18f::40) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8466.20 via Frontend Transport; Mon, 24 Feb 2025 06:53:34 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by DS3PEPF0000C37A.mail.protection.outlook.com (10.167.23.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.11 via Frontend Transport; Mon, 24 Feb 2025 06:53:34 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sun, 23 Feb 2025 22:53:23 -0800 Received: from shredder.nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Sun, 23 Feb 2025 22:53:21 -0800 From: Ido Schimmel To: CC: , , , , Ido Schimmel Subject: [PATCH iproute2-next 4/5] iprule: Add port mask support Date: Mon, 24 Feb 2025 08:52:39 +0200 Message-ID: <20250224065241.236141-5-idosch@nvidia.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250224065241.236141-1-idosch@nvidia.com> References: <20250224065241.236141-1-idosch@nvidia.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS3PEPF0000C37A:EE_|SA3PR12MB7951:EE_ X-MS-Office365-Filtering-Correlation-Id: 5e1bd203-b961-49e3-435c-08dd549ff4fb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|82310400026|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: ZwyNcwCSaT43gONREItkgWNMmgv0WUV6eO0IVZbksug+9XH+IXK7cs3p2Xijw0uA0cZ9pD2jaEjwaK6g/+drUkqu7VycA5HpY8L9CkgPfugvkQ1qmJnlnqsQAS5heYImgAtuNXzyzFYMvQsoyJmmo0iDXN4Lhr+B+/7W2UTHmYXI4eX7vAN2nGXXGTa/2L95z9P2mHVoLJ4cURrYuMP2L7V8LAeWq5k2/iTdMUuscQhNsgAXlf1KJ13bZORdmpoU5/wQ6mfmzoASjlacpM6bhyk2CM6eSuqFVNMmhKP6iyKS1iJEhNf1lqQZZ+u0oho/oCsQsWF1vNK9CfYVbo3e1oEaKQ3PrKxNMjaRgQ8k1AsCFfBg0fDKODY+jns37a7Q//o1EOuLArURtHLSa1iHbZSLRlnFHgd825Wm7Uxpj5WPoTOQTAhZDvVurxslbBoX/1ywgo1+uT7RplmZfjKjbPBzBTwjiK7z159aEASnPdEBvExADR0BCGHW1MN4z2e/sxjtfAPQzI7UxnevBvddK/Wo8UeBUMW7RdVDDaRr31AesGvNmddQwPq+NlMXn/Y3n+tbpmMBn+IjQZMtCo3ns2xduQduHJzmB8rrJPNutfQsZYhhyvTSifMWUynaWiis3NwutICiKQ0YMrxm5PhhXjK3iJlcIRSne5g2uQmUFC/OydSsdkOQOFzmsbl5R4XryxPBW7dDTUxbBHGYq0tPMUTAFedWVWiAu7Qa+3s4cUb5ChwNtBJ2yZOwize93npl+6V6iBR0pwIzr8ieAV+NuNxBBnly8CTv9O/GpSHlnR9J9bDNASOk7TwKV/2obgQ/EYXacWjlzvJk1oEc/pLobpkVugSde+8AKu1rbzRCzBToGmfg0gi13BHJdlD+Cj06AaYIpu82138bHP/JAneTiHodDjoPgrDqvOXhDk7IPHQFhTMEv8uY2Dmm0CT8gTMx+uoTUjWhknYc0Q6q7Cw9XBqcWQOmGNGIAwxLlgQKT9oNIRwaCwEGlrX9OPV1YsckP30JOgWT5wu5nwOsVNjqRauDEBhXdzaEO0tXtMyewAq2AqR80sWPb1YSTlXBa+pKMVMVJC0vcLNIN68VG7ed6dmETnQOk/D9SigT75XvLsD3O8VNcM2PB/6ibf+ZSJUZi6wkZKidlC09x275aQK7aD8JaMKfUHevl8FHqqR9wnvnB5f/Uoju/I3Uva+Zlwrzf/9ediTlccpsrQy6D4JwOuP5mDTEq/I0u+YfNjHHWJHvpAW9F+CAmPfn6Tej8pA9Vpj+LqP21DdhDhpsJsSCzgOVfc9VkKTfVvQKFbUNd22dzR1USS3XoDQaBcF4MjILe53ODfwUPZE07tB5R4rHmvfaevd8ESnsIShMs8sk8tzchPbwwH6+Ky/HpuUwGswJt42LhQ4Hyhb8UX0Uga76tGAMUhPpoch2IHbcEE2gFEs5pG0T4InDqyMZJhtxQLwdr1HcK1qIGwZvMMR4iH5eqesQKHreld0a6T2vraiZg9A= X-Forefront-Antispam-Report: CIP:216.228.117.160;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge1.nvidia.com;CAT:NONE;SFS:(13230040)(376014)(82310400026)(1800799024)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Feb 2025 06:53:34.1556 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5e1bd203-b961-49e3-435c-08dd549ff4fb X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.160];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DS3PEPF0000C37A.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR12MB7951 X-Patchwork-Delegate: dsahern@gmail.com Add port mask support, allowing users to specify a source or destination port with an optional mask. Example: # ip rule add sport 80 table 100 # ip rule add sport 90/0xffff table 200 # ip rule add dport 1000-2000 table 300 # ip rule add sport 0x123/0xfff table 400 # ip rule add dport 0x4/0xff table 500 # ip rule add dport 0x8/0xf table 600 # ip rule del dport 0x8/0xf table 600 In non-JSON output, the mask is not printed in case of exact match: $ ip rule show 0: from all lookup local 32761: from all dport 0x4/0xff lookup 500 32762: from all sport 0x123/0xfff lookup 400 32763: from all dport 1000-2000 lookup 300 32764: from all sport 90 lookup 200 32765: from all sport 80 lookup 100 32766: from all lookup main 32767: from all lookup default Dump can be filtered by port value and mask: $ ip rule show sport 80 32765: from all sport 80 lookup 100 $ ip rule show sport 90 32764: from all sport 90 lookup 200 $ ip rule show sport 0x123/0x0fff 32762: from all sport 0x123/0xfff lookup 400 $ ip rule show dport 4/0xff 32761: from all dport 0x4/0xff lookup 500 In JSON output, the port mask is printed as an hexadecimal string to be consistent with other masks. The port value is printed as an integer in order not to break existing scripts: $ ip -j -p rule show sport 0x123/0xfff table 400 [ { "priority": 32762, "src": "all", "sport": 291, "sport_mask": "0xfff", "table": "400" } ] The mask attribute is only sent to the kernel in case of inexact match so that iproute2 will continue working with kernels that do not support the attribute. Signed-off-by: Ido Schimmel --- ip/iprule.c | 103 +++++++++++++++++++++++++++++++++++++----- man/man8/ip-rule.8.in | 14 +++--- 2 files changed, 100 insertions(+), 17 deletions(-) diff --git a/ip/iprule.c b/ip/iprule.c index 64d389bebb76..fbe69a3b6293 100644 --- a/ip/iprule.c +++ b/ip/iprule.c @@ -23,6 +23,8 @@ #include "ip_common.h" #include "json_print.h" +#define PORT_MAX_MASK 0xFFFF + enum list_action { IPRULE_LIST, IPRULE_FLUSH, @@ -44,8 +46,8 @@ static void usage(void) " [ iif STRING ] [ oif STRING ] [ pref NUMBER ] [ l3mdev ]\n" " [ uidrange NUMBER-NUMBER ]\n" " [ ipproto PROTOCOL ]\n" - " [ sport [ NUMBER | NUMBER-NUMBER ]\n" - " [ dport [ NUMBER | NUMBER-NUMBER ] ]\n" + " [ sport [ NUMBER[/MASK] | NUMBER-NUMBER ]\n" + " [ dport [ NUMBER[/MASK] | NUMBER-NUMBER ] ]\n" " [ dscp DSCP ] [ flowlabel FLOWLABEL[/MASK] ]\n" "ACTION := [ table TABLE_ID ]\n" " [ protocol PROTO ]\n" @@ -80,6 +82,7 @@ static struct int protocolmask; struct fib_rule_port_range sport; struct fib_rule_port_range dport; + __u16 sport_mask, dport_mask; __u8 ipproto; } filter; @@ -186,8 +189,9 @@ static bool filter_nlmsg(struct nlmsghdr *n, struct rtattr **tb, int host_len) return false; } - if (filter.sport.start) { + if (filter.sport_mask) { const struct fib_rule_port_range *r; + __u16 sport_mask = PORT_MAX_MASK; if (!tb[FRA_SPORT_RANGE]) return false; @@ -196,10 +200,16 @@ static bool filter_nlmsg(struct nlmsghdr *n, struct rtattr **tb, int host_len) if (r->start != filter.sport.start || r->end != filter.sport.end) return false; + + if (tb[FRA_SPORT_MASK]) + sport_mask = rta_getattr_u16(tb[FRA_SPORT_MASK]); + if (filter.sport_mask != sport_mask) + return false; } - if (filter.dport.start) { + if (filter.dport_mask) { const struct fib_rule_port_range *r; + __u16 dport_mask = PORT_MAX_MASK; if (!tb[FRA_DPORT_RANGE]) return false; @@ -208,6 +218,11 @@ static bool filter_nlmsg(struct nlmsghdr *n, struct rtattr **tb, int host_len) if (r->start != filter.dport.start || r->end != filter.dport.end) return false; + + if (tb[FRA_DPORT_MASK]) + dport_mask = rta_getattr_u16(tb[FRA_DPORT_MASK]); + if (filter.dport_mask != dport_mask) + return false; } if (filter.tun_id) { @@ -390,7 +405,26 @@ int print_rule(struct nlmsghdr *n, void *arg) struct fib_rule_port_range *r = RTA_DATA(tb[FRA_SPORT_RANGE]); if (r->start == r->end) { - print_uint(PRINT_ANY, "sport", " sport %u", r->start); + if (tb[FRA_SPORT_MASK]) { + __u16 mask; + + mask = rta_getattr_u16(tb[FRA_SPORT_MASK]); + print_uint(PRINT_JSON, "sport", NULL, r->start); + print_0xhex(PRINT_JSON, "sport_mask", NULL, + mask); + if (mask == PORT_MAX_MASK) { + print_uint(PRINT_FP, NULL, " sport %u", + r->start); + } else { + print_0xhex(PRINT_FP, NULL, + " sport %#x", r->start); + print_0xhex(PRINT_FP, NULL, "/%#x", + mask); + } + } else { + print_uint(PRINT_ANY, "sport", " sport %u", + r->start); + } } else { print_uint(PRINT_ANY, "sport_start", " sport %u", r->start); @@ -402,7 +436,26 @@ int print_rule(struct nlmsghdr *n, void *arg) struct fib_rule_port_range *r = RTA_DATA(tb[FRA_DPORT_RANGE]); if (r->start == r->end) { - print_uint(PRINT_ANY, "dport", " dport %u", r->start); + if (tb[FRA_DPORT_MASK]) { + __u16 mask; + + mask = rta_getattr_u16(tb[FRA_DPORT_MASK]); + print_uint(PRINT_JSON, "dport", NULL, r->start); + print_0xhex(PRINT_JSON, "dport_mask", NULL, + mask); + if (mask == 0xFFFF) { + print_uint(PRINT_FP, NULL, " dport %u", + r->start); + } else { + print_0xhex(PRINT_FP, NULL, + " dport %#x", r->start); + print_0xhex(PRINT_FP, NULL, "/%#x", + mask); + } + } else { + print_uint(PRINT_ANY, "dport", " dport %u", + r->start); + } } else { print_uint(PRINT_ANY, "dport_start", " dport %u", r->start); @@ -600,10 +653,13 @@ static int flush_rule(struct nlmsghdr *n, void *arg) return 0; } -static void iprule_port_parse(char *arg, struct fib_rule_port_range *r) +static void iprule_port_parse(char *arg, struct fib_rule_port_range *r, + __u16 *mask) { char *sep; + *mask = PORT_MAX_MASK; + sep = strchr(arg, '-'); if (sep) { *sep = '\0'; @@ -617,6 +673,21 @@ static void iprule_port_parse(char *arg, struct fib_rule_port_range *r) return; } + sep = strchr(arg, '/'); + if (sep) { + *sep = '\0'; + + if (get_u16(&r->start, arg, 0)) + invarg("invalid port", arg); + + r->end = r->start; + + if (get_u16(mask, sep + 1, 0)) + invarg("invalid mask", sep + 1); + + return; + } + if (get_u16(&r->start, arg, 0)) invarg("invalid port", arg); @@ -770,10 +841,12 @@ static int iprule_list_flush_or_save(int argc, char **argv, int action) filter.ipproto = ipproto; } else if (strcmp(*argv, "sport") == 0) { NEXT_ARG(); - iprule_port_parse(*argv, &filter.sport); + iprule_port_parse(*argv, &filter.sport, + &filter.sport_mask); } else if (strcmp(*argv, "dport") == 0) { NEXT_ARG(); - iprule_port_parse(*argv, &filter.dport); + iprule_port_parse(*argv, &filter.dport, + &filter.dport_mask); } else if (strcmp(*argv, "dscp") == 0) { __u32 dscp; @@ -1043,18 +1116,26 @@ static int iprule_modify(int cmd, int argc, char **argv) addattr8(&req.n, sizeof(req), FRA_IP_PROTO, ipproto); } else if (strcmp(*argv, "sport") == 0) { struct fib_rule_port_range r; + __u16 sport_mask; NEXT_ARG(); - iprule_port_parse(*argv, &r); + iprule_port_parse(*argv, &r, &sport_mask); addattr_l(&req.n, sizeof(req), FRA_SPORT_RANGE, &r, sizeof(r)); + if (sport_mask != PORT_MAX_MASK) + addattr16(&req.n, sizeof(req), FRA_SPORT_MASK, + sport_mask); } else if (strcmp(*argv, "dport") == 0) { struct fib_rule_port_range r; + __u16 dport_mask; NEXT_ARG(); - iprule_port_parse(*argv, &r); + iprule_port_parse(*argv, &r, &dport_mask); addattr_l(&req.n, sizeof(req), FRA_DPORT_RANGE, &r, sizeof(r)); + if (dport_mask != PORT_MAX_MASK) + addattr16(&req.n, sizeof(req), FRA_DPORT_MASK, + dport_mask); } else if (strcmp(*argv, "dscp") == 0) { __u32 dscp; diff --git a/man/man8/ip-rule.8.in b/man/man8/ip-rule.8.in index 6fc741d4f470..4945ccd55076 100644 --- a/man/man8/ip-rule.8.in +++ b/man/man8/ip-rule.8.in @@ -52,10 +52,10 @@ ip-rule \- routing policy database management .B ipproto .IR PROTOCOL " ] [ " .BR sport " [ " -.IR NUMBER " | " +.IR NUMBER\fR[\fB/\fIMASK "] | " .IR NUMBER "-" NUMBER " ] ] [ " .BR dport " [ " -.IR NUMBER " | " +.IR NUMBER\fR[\fB/\fIMASK "] | " .IR NUMBER "-" NUMBER " ] ] [ " .B tun_id .IR TUN_ID " ] [ " @@ -270,12 +270,14 @@ value to match. select the ip protocol value to match. .TP -.BI sport " NUMBER | NUMBER-NUMBER" -select the source port value to match. supports port range. +.BI sport " NUMBER\fR[\fB/\fIMASK\fR] | NUMBER-NUMBER" +select the source port value to match with an optional mask. supports port +range. .TP -.BI dport " NUMBER | NUMBER-NUMBER" -select the destination port value to match. supports port range. +.BI dport " NUMBER\fR[\fB/\fIMASK\fR] | NUMBER-NUMBER" +select the destination port value to match with an optional mask. supports port +range. .TP .BI priority " PREFERENCE" From patchwork Mon Feb 24 06:52:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 13987488 X-Patchwork-Delegate: dsahern@gmail.com Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2071.outbound.protection.outlook.com [40.107.94.71]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ADE361A3160 for ; Mon, 24 Feb 2025 06:53:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.94.71 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740380022; cv=fail; b=fgMi8t368Q13+l29Hmp8avabYvMzjzHED3ClXwr2Iuq/6zSQSlwjnXb2jcYExlnZQshZSEDV7eGkFOanTMR9pTJUVXGIfSXj6/Y82NPuALiK8M2A9Vzrb0x4OrUn3NIeWbwD9km4PZDLBspb7etU0l8QDybC10o2FdX06NWhRn4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740380022; c=relaxed/simple; bh=MOE6fgSbvADWYBCFRSlG3btFQ2enFZXGT3E00hSfI3Q=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=dqCSZ+fI1vorgQ2GLX6NPIYtVEvB+gqWGV2NpPTg7aTGxIdo4Qv5eAeFdpwDK1BRZDNomk/d2slKfx0pgO1o6gRTKv0vEzIkglosDQC/xTWnFe6zG3QYfHy5cSS4kv8vINBqivG7Tb9hgUElpRQQlGFYOAt5nOxKcUqWXS4tCo8= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=J+1I1pVH; arc=fail smtp.client-ip=40.107.94.71 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="J+1I1pVH" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=jdB7VC0OFkeJsl9hKWm84jD6qR6ClJb3ueTiQtT1adNwvz7DRkNgiZFo7qGOo1GqokXdNEsNiqORGujTz8DM2DqqIDZOkv2oNR4NWaSiX9g8zwPFTcIduW1qOsCFRCTdYtYpRmfb5hJJGyvF1sT5s96hGZjgvtAnrLkQiRwEvhQpwSa7tXNlK+2jBiBJ28nqlyRhQ8UxfTmUo4iSbCFp0AE8iYDxgIoGeCM5bRPZiVmuJf3wLve40HegdnNUCJHatoJ3+cPm/veStafwuXVddAw97f34MV8b+4GTPgFzwc8dJls78uJ/cvwMSUmbNthGnuUbDLXyTdmQ25+Q/GIh6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=TekZGvKoY49AFIL7KcOzfIE4zxP+rj9/EMW9KE9MicQ=; b=vjMVH+XwBguTOGM+pWYhpImLsNbqGGG4Rq1+l+WheLG1374XDDcAFVrurIPXbSEXwukq8BxzR8Xx1rlq8BpG8Qmvi2xu/cD2H2OigDL+2TO3YKoi39DPjI3Ht/GDdq+DU/xI2VDyRQ2Reh8sjpa8zsYUCPDOF0ddSSBQMcHtLbW9Bt50XhrPz7NzPXIQ2atYln22Ty61QO6hi577O7+WiiOkJG/uNL8ijPdeaJGZ7d5uNNOfKCtQ0wrvxbNJCvCOSkpTiGraQzl3qyQI0gT4ljHl+yxR66egWK/AHmN2kgYdtnPU7z1ps0n5pWWHI3Grx5I5iM/gCnLdcYzo+1MKww== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TekZGvKoY49AFIL7KcOzfIE4zxP+rj9/EMW9KE9MicQ=; b=J+1I1pVHUlIpItqkMRuvr8e/SIz+c66f+UEo7nNXJozZf5ErB92vN+aSAU2+q4avCuW3SdDZPdaUgkrUoVLgLGWzg/bwBoLK4EYGWlpwgSm8DUA28OijxlOcw9Am9xC3xHHgiccc/V9lJ0nrD30iEJKlOdaurroFenee3bCnl7CiULKQo70ppqJXBoYdwWmbTX5m/Vq5afLq1h9sT4uJcuICn3xpC+UdzMGEF9P01yYYVl+IWEPNH+k3oGF2cVuhc8oAS1hU2wU8wYrwAg+vPeOf5UOoK3wX/mmaPht9ZqRu7gO48/U/i7Cj8SJPazvg8TdADbXFoHprCrq9sWFDew== Received: from DM6PR14CA0044.namprd14.prod.outlook.com (2603:10b6:5:18f::21) by SA1PR12MB8144.namprd12.prod.outlook.com (2603:10b6:806:337::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.20; Mon, 24 Feb 2025 06:53:37 +0000 Received: from DS3PEPF0000C37A.namprd04.prod.outlook.com (2603:10b6:5:18f:cafe::8f) by DM6PR14CA0044.outlook.office365.com (2603:10b6:5:18f::21) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8466.20 via Frontend Transport; Mon, 24 Feb 2025 06:53:37 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by DS3PEPF0000C37A.mail.protection.outlook.com (10.167.23.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.11 via Frontend Transport; Mon, 24 Feb 2025 06:53:37 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sun, 23 Feb 2025 22:53:25 -0800 Received: from shredder.nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Sun, 23 Feb 2025 22:53:23 -0800 From: Ido Schimmel To: CC: , , , , Ido Schimmel Subject: [PATCH iproute2-next 5/5] iprule: Add DSCP mask support Date: Mon, 24 Feb 2025 08:52:40 +0200 Message-ID: <20250224065241.236141-6-idosch@nvidia.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250224065241.236141-1-idosch@nvidia.com> References: <20250224065241.236141-1-idosch@nvidia.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS3PEPF0000C37A:EE_|SA1PR12MB8144:EE_ X-MS-Office365-Filtering-Correlation-Id: f9038eac-f2c6-42c8-914c-08dd549ff6ce X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|82310400026|36860700013; X-Microsoft-Antispam-Message-Info: FsqK7RS97uvklRJH/VuF63rWHaw63AcVrEmYr88/sUJ16rRCw1hrCZt/xSJqy/rH8AyY4jfkSMwhE5/8LvY/jUSnpJ1w/1mHY5cAnoc6Mcg6Bis5w3PuU4u7BTS9H6Dn4SN6jnp7tFbtBa9Rw69h4Afitvt3k1E3mkUzvzDSFpJuJqfPXd8CYChQoEbFeIWbKWLr6tV/hcdC63TCtSGuVu2UZsxR3kEcWtRbchByN3XAizdQUOWS+6WsKyEBZPa6CM8v/AKYjfeMHm6rArPzc8+jnqmeqPOb6/2EnvzELisYsFmS5+QHZPiwPr7F6y5xcBJxTKmnHubrTdB+EiuJmpuoLS+bNq3PXheLZPjXU3uLVfkKClXwrydF2rqI+pwvqIEsMlW/04z14tp+HDn6/P+x2UxprvzfmQYAR6DBZjCaat9jYv0FqfhoDV8nbLFxJ9OHpua3V8unLXCRo6FajK3QAU2sgb21iCau9tk0w+dSnL2CvZxv+9pvkI6FqlHArIfVXeZh67YR9gjtgb4UtL8qxgNn9adNh6XbXb4LCiWGL7Vc1LbVm5j8tVSY9l8CrRHIjzaH4MT9zJ0C5OOv4jhkdPwbkqhJ/tMCjGCoYOVmlVNUAua8DN7H7z0x7YEQ7zcoxIpc+wI/0eA74e8zLi5yrbYHXA0eBnZplFgmI6sdnu/kTXxh114QdAK5622QAQ4ZZUFeREQ9O+NE3n53RzaD13BrgmLBpr+iKB1R35H86iaI441wgAQosGiLkNNvPCv+5yr+gRq7mMvUpRSWS4IT/Mp/IiqHtuD6rvwsapvTqSfEPa/HEZO8zc2HGKzfE+AaPmu/5q9fw1Sdn3SyjuetIrWbf8wI1KiRSuFYTNUbqEDJK2a/ae+c152Ph2+xO2+Zaq1Km8kMoF0NggwRT6u4iBgurq1EmAaNpNJEk+vYNIMWOwdXsJc6WcDRvIeK9FMbr2eV9zyVgutzvN3RlZN/ZlG0Dcb57VKq5N32aWoempq5zPXAKK7E3LqdTV/luLtm338n7g8gUS+5oMWNrvcZQCVcZpNV8oTXKH8pdY9kN2RvHugthKkXsE1JTusIKDy4sW4hO/M1Y4+rgmUY1GUGH1TvWM/fRAHpnkQN2sppJGv574UUWR7ZXfnWCCenrWsmbuoPQq+jSpXzXSqEQWcILpkWBUHoOzi6wxPh8V1xlZ/MRX6LHko0a3K7hDAj0XoyJP4m0tQUmsEacL2eC3V/jhXW0VmQY7ZC6RPg4fjtTe82SQmljMQwvNbGlGYgNxN6iMXGFaeyT7//QsCP3YfggIS57i85a5JtgDkVMHV0EknoBLi/kSMmjTZahjlP29iQIV+WYyOUjNHe0VWONPKIdfM3GkTB8i4V4gfQhn4/QrFsi2OP17cI3u8AcaX/gkF6R8jTjJGuUiBWRHkPedVzyUYiCKbrZwQLiZPOqqk127hn3MKHgoTxfTtwJI1s2AL4mjZkuMx8GM+uQLjesa7bAKQKRB0vPLgf9Lc+5OE= X-Forefront-Antispam-Report: CIP:216.228.117.160;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge1.nvidia.com;CAT:NONE;SFS:(13230040)(376014)(1800799024)(82310400026)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Feb 2025 06:53:37.2181 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f9038eac-f2c6-42c8-914c-08dd549ff6ce X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.160];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DS3PEPF0000C37A.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB8144 X-Patchwork-Delegate: dsahern@gmail.com Add DSCP mask support, allowing users to specify a DSCP value with an optional mask. Example: # ip rule add dscp 1 table 100 # ip rule add dscp 0x02/0x3f table 200 # ip rule add dscp AF42/0x3f table 300 # ip rule add dscp 0x10/0x30 table 400 In non-JSON output, the DSCP mask is not printed in case of exact match and the DSCP value is printed in hexadecimal format in case of inexact match: $ ip rule show 0: from all lookup local 32762: from all lookup 400 dscp 0x10/0x30 32763: from all lookup 300 dscp AF42 32764: from all lookup 200 dscp 2 32765: from all lookup 100 dscp 1 32766: from all lookup main 32767: from all lookup default Dump can be filtered by DSCP value and mask: $ ip rule show dscp 1 32765: from all lookup 100 dscp 1 $ ip rule show dscp AF42 32763: from all lookup 300 dscp AF42 $ ip rule show dscp 0x10/0x30 32762: from all lookup 400 dscp 0x10/0x30 In JSON output, the DSCP mask is printed as an hexadecimal string to be consistent with other masks. The DSCP value is printed as an integer in order not to break existing scripts: $ ip -j -p -N rule show dscp 0x10/0x30 [ { "priority": 32762, "src": "all", "table": "400", "dscp": "16", "dscp_mask": "0x30" } ] The mask attribute is only sent to the kernel in case of inexact match so that iproute2 will continue working with kernels that do not support the attribute. Signed-off-by: Ido Schimmel --- ip/iprule.c | 73 ++++++++++++++++++++++++++++++++----------- man/man8/ip-rule.8.in | 9 +++--- 2 files changed, 60 insertions(+), 22 deletions(-) diff --git a/ip/iprule.c b/ip/iprule.c index fbe69a3b6293..d4d57b8c96df 100644 --- a/ip/iprule.c +++ b/ip/iprule.c @@ -24,6 +24,7 @@ #include "json_print.h" #define PORT_MAX_MASK 0xFFFF +#define DSCP_MAX_MASK 0x3F enum list_action { IPRULE_LIST, @@ -48,7 +49,7 @@ static void usage(void) " [ ipproto PROTOCOL ]\n" " [ sport [ NUMBER[/MASK] | NUMBER-NUMBER ]\n" " [ dport [ NUMBER[/MASK] | NUMBER-NUMBER ] ]\n" - " [ dscp DSCP ] [ flowlabel FLOWLABEL[/MASK] ]\n" + " [ dscp DSCP[/MASK] ] [ flowlabel FLOWLABEL[/MASK] ]\n" "ACTION := [ table TABLE_ID ]\n" " [ protocol PROTO ]\n" " [ nat ADDRESS ]\n" @@ -238,14 +239,21 @@ static bool filter_nlmsg(struct nlmsghdr *n, struct rtattr **tb, int host_len) } if (filter.dscpmask) { - if (tb[FRA_DSCP]) { - __u8 dscp = rta_getattr_u8(tb[FRA_DSCP]); + __u8 dscp_mask = DSCP_MAX_MASK; + __u8 dscp; - if (filter.dscp != dscp) - return false; - } else { + if (!tb[FRA_DSCP]) + return false; + + dscp = rta_getattr_u8(tb[FRA_DSCP]); + if (filter.dscp != dscp) + return false; + + if (tb[FRA_DSCP_MASK]) + dscp_mask = rta_getattr_u8(tb[FRA_DSCP_MASK]); + + if (filter.dscpmask != dscp_mask) return false; - } } if (filter.flowlabel_mask) { @@ -552,8 +560,24 @@ int print_rule(struct nlmsghdr *n, void *arg) if (tb[FRA_DSCP]) { __u8 dscp = rta_getattr_u8(tb[FRA_DSCP]); - print_string(PRINT_ANY, "dscp", " dscp %s", - rtnl_dscp_n2a(dscp, b1, sizeof(b1))); + if (tb[FRA_DSCP_MASK]) { + __u8 mask = rta_getattr_u8(tb[FRA_DSCP_MASK]); + + print_string(PRINT_JSON, "dscp", NULL, + rtnl_dscp_n2a(dscp, b1, sizeof(b1))); + print_0xhex(PRINT_JSON, "dscp_mask", NULL, mask); + if (mask == DSCP_MAX_MASK) { + print_string(PRINT_FP, NULL, " dscp %s", + rtnl_dscp_n2a(dscp, b1, + sizeof(b1))); + } else { + print_0xhex(PRINT_FP, NULL, " dscp %#x", dscp); + print_0xhex(PRINT_FP, NULL, "/%#x", mask); + } + } else { + print_string(PRINT_ANY, "dscp", " dscp %s", + rtnl_dscp_n2a(dscp, b1, sizeof(b1))); + } } /* The kernel will either provide both attributes, or none */ @@ -694,6 +718,21 @@ static void iprule_port_parse(char *arg, struct fib_rule_port_range *r, r->end = r->start; } +static void iprule_dscp_parse(char *arg, __u32 *dscp, __u32 *mask) +{ + char *slash; + + *mask = DSCP_MAX_MASK; + + slash = strchr(arg, '/'); + if (slash != NULL) + *slash = '\0'; + if (rtnl_dscp_a2n(dscp, arg)) + invarg("invalid dscp", arg); + if (slash && get_u32(mask, slash + 1, 0)) + invarg("invalid dscp mask", slash + 1); +} + static void iprule_flowlabel_parse(char *arg, __u32 *flowlabel, __u32 *flowlabel_mask) { @@ -848,13 +887,9 @@ static int iprule_list_flush_or_save(int argc, char **argv, int action) iprule_port_parse(*argv, &filter.dport, &filter.dport_mask); } else if (strcmp(*argv, "dscp") == 0) { - __u32 dscp; - NEXT_ARG(); - if (rtnl_dscp_a2n(&dscp, *argv)) - invarg("invalid dscp\n", *argv); - filter.dscp = dscp; - filter.dscpmask = 1; + iprule_dscp_parse(*argv, &filter.dscp, + &filter.dscpmask); } else if (strcmp(*argv, "flowlabel") == 0) { NEXT_ARG(); @@ -1137,12 +1172,14 @@ static int iprule_modify(int cmd, int argc, char **argv) addattr16(&req.n, sizeof(req), FRA_DPORT_MASK, dport_mask); } else if (strcmp(*argv, "dscp") == 0) { - __u32 dscp; + __u32 dscp, dscp_mask; NEXT_ARG(); - if (rtnl_dscp_a2n(&dscp, *argv)) - invarg("invalid dscp\n", *argv); + iprule_dscp_parse(*argv, &dscp, &dscp_mask); addattr8(&req.n, sizeof(req), FRA_DSCP, dscp); + if (dscp_mask != DSCP_MAX_MASK) + addattr8(&req.n, sizeof(req), FRA_DSCP_MASK, + dscp_mask); } else if (strcmp(*argv, "flowlabel") == 0) { __u32 flowlabel, flowlabel_mask; diff --git a/man/man8/ip-rule.8.in b/man/man8/ip-rule.8.in index 4945ccd55076..7d6a82b2c492 100644 --- a/man/man8/ip-rule.8.in +++ b/man/man8/ip-rule.8.in @@ -37,7 +37,7 @@ ip-rule \- routing policy database management .B tos .IR TOS " ] [ " .B dscp -.IR DSCP " ] [ " +.IR DSCP\fR[\fB/\fIMASK "] ] [ " .B fwmark .IR FWMARK\fR[\fB/\fIMASK "] ] [ " .B iif @@ -239,9 +239,10 @@ a device. select the TOS value to match. .TP -.BI dscp " DSCP" -select the DSCP value to match. DSCP values can be written either directly as -numeric values (valid values are 0-63), or using symbolic names specified in +.BI dscp " DSCP\fR[\fB/\fIMASK\fR]" +select the DSCP value to match with an optional mask. DSCP values can be +written either directly as numeric values (valid values are 0-63), or using +symbolic names specified in .BR @SYSCONF_USR_DIR@/rt_dsfield " or " @SYSCONF_ETC_DIR@/rt_dsfield (has precedence if exists). However, note that the file specifies full 8-bit dsfield values, whereas