From patchwork Wed Aug 21 12:52:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 13771398 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2053.outbound.protection.outlook.com [40.107.220.53]) (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 0F6281917E3; Wed, 21 Aug 2024 12:54:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.220.53 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724244901; cv=fail; b=gZiJB8TN/vODMLsMboSPP2TVMYcW7uQmKEY4CAWOm/KGNgaKVOMx1JkZqa2/yGqIzDN4Ft2LWdsyL2TH+5XYcJ4vj1iKLwXbXkhcTH6lfaJml41thno0pHvvf8bV931NqO+leQcWMe8/A3LwCvdAVP067dsLQgZo7eZS8S2/pqY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724244901; c=relaxed/simple; bh=Ssgb6Gjv8Djkc940o+y++j8P4eTDOEMBFYMxsxaxxo0=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=MfYNddqF0g9rQj4UqwojVAo4MBEhIHBec5mxgfo23LNXEigv5ByGK39UNHYmnF/Si/Ice37L+m5+7qavhAH6WgcBEf2TkYd7dl5grhiQ6yGid0EXfITwTHNZSDfhCAgtEboz2mjb5H4ARZTbhMg1KvA3QhpEMpVKRY4QKtr9AQI= 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=ST6CnQy4; arc=fail smtp.client-ip=40.107.220.53 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="ST6CnQy4" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=AtiDwjApGqOb9noUEiZcU3VGchn6orrkdR1jdhNrEC6yjDo4DyxHQTBumW4O47QW+m/Kb+pDqZVfsYiK9WiwbhO+NGJXTRA0PvKfw5MqCh2ggAk3ejg0VcJOmXsNyGVz9n6XyzwlvaqnUAAaE+L3/I++XOJCnSepuavH7FwXNOmYPfRYZGNtHU+Xa0fE0m2f6yo2Ck/fb3MGWwb8uEBrB5dJWMN6BUNziI1BRaNZgTiJoRPECdpNy4vWJOgfam5Vkt3XxnKD/MlgGPgTx1jgJzVT7uD1NJ3LaG5/aE2PwtQEeQTuDuSQP8Z/fzMjOdAYZP+AukA26PmQZbbHRRDhlA== 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=9Oxap+lbKuGnFwiMyedrVUKBjetL57NAW/XhLbwv1o4=; b=FeLhb75PUbRBBARq69EqI8fIQ9gnDA4eZmPzKvrZERbgj327YtG+kMYEJndFPVvxZnjqDjIVu8y1i7Yiwir0Q2H9HiQrSas/t1pPqvM9FUZ2OzBrfiirnzNnBqHFI24V1B5KvLHo+36cUdFyDby+zdcR1nYw3ag3BxWOYCKU4PXcFghPJRyrBmkNBUGSJ8cl9NPfTWZEs0ePS2qATyG2pj3I2ia3dmaarNneWQtl/q54eaFljvI+GR9kygRT85ga4jST1H99QliTXqmKtcohztQXDR4j3j8G+3hCHfRIB0tVGSBuHwKyJYWMMoLejDd33po8Brk927Nv9lEbWtD29g== 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=9Oxap+lbKuGnFwiMyedrVUKBjetL57NAW/XhLbwv1o4=; b=ST6CnQy4k2NW9dZuFqGksHRguTEtm6UHt2TALkJ63lz/UGDW0M3TIBkT7uznu20Fj1afo08jb8+JVulcuIlBN3ZScX55xJwMUD4WsFhrpF5zMb9NhF7ZMmTIFtTv0X1l1gTsRtB53XohMO945jg3jokTP7+mgW0tvGEwb3ukjAJuD4XRMhNGMp+/uBGPydGOhrtBddeNFZ2P9yo87nMRiGo4ioS00TFeSiCfiMwbyUbOlTksDwa+sLItT6B5dJ71oTBpihJULCaez1BEi58MwcptB4e4FATOfJPSxWqNO7WnAOZ4u/6eQycuy+CDAe2wV/UEcvRxyhC4P028ZeBpFA== Received: from DS7PR05CA0076.namprd05.prod.outlook.com (2603:10b6:8:57::13) by PH7PR12MB7330.namprd12.prod.outlook.com (2603:10b6:510:20d::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.19; Wed, 21 Aug 2024 12:54:55 +0000 Received: from DS1PEPF0001708E.namprd03.prod.outlook.com (2603:10b6:8:57:cafe::48) by DS7PR05CA0076.outlook.office365.com (2603:10b6:8:57::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.19 via Frontend Transport; Wed, 21 Aug 2024 12:54:55 +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 DS1PEPF0001708E.mail.protection.outlook.com (10.167.17.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.11 via Frontend Transport; Wed, 21 Aug 2024 12:54:55 +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; Wed, 21 Aug 2024 05:54:42 -0700 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.4; Wed, 21 Aug 2024 05:54:37 -0700 From: Ido Schimmel To: CC: , , , , , , , , , , , , , , , , , Ido Schimmel Subject: [PATCH net-next 01/12] bpf: Unmask upper DSCP bits in bpf_fib_lookup() helper Date: Wed, 21 Aug 2024 15:52:40 +0300 Message-ID: <20240821125251.1571445-2-idosch@nvidia.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240821125251.1571445-1-idosch@nvidia.com> References: <20240821125251.1571445-1-idosch@nvidia.com> Precedence: bulk X-Mailing-List: bpf@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: DS1PEPF0001708E:EE_|PH7PR12MB7330:EE_ X-MS-Office365-Filtering-Correlation-Id: efd79f00-2d11-4039-313d-08dcc1e074a5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|1800799024|7416014|376014|82310400026; X-Microsoft-Antispam-Message-Info: fh+ULgAkDsLgLFbnbLiSAfgA7WJQv9E4bFPrgwYigWYZuScyPYyNcbBsl8B4L2gYjFToVlVuB5t/Rqk4z4S/9yKJfZUSBfJtbGkVrxNJ3fWWJlXpPabIOZ3Oh4dbX9Wj8TkYSdAAOWTdNZQTOk8Qev1D4zm9yMRU0qCfnl+IeSWlLP9yUx+sOaQeDHu9BNAFBX03tLpptOj+WbvF2WGHHDEQmz9hrwpOS7MxJpMd7PF5D9qyGB3gp75RIfVntLlc2DpbfdlDwB1h8k69x7psIMjqdluVll9DgwDaognSwR92mS+oPpmEQglhSQNRLzFF6A6UXnQ7Z4ICoRmN9gVSTCxSp2HfAbsCT9sU/VQlPqwygooqBGXd+1NiWPEp9Hqt+F5mS3CJ+3Rvf4ewLuUBspF1xWoKebB+M8OfqUaHkG6hsTI/NWVEWGEMAKf0D5JvxhmREXnikY21GrjTDn9DWFenmhJUyv6mgKfXus7l1IxYderu/QrC/gDy5b/2txT3gGvcNOdGTImKcVO6h/GxjJfsrLT+cKH5Q42+DNimMLVs/JRbHkmhknnitat3K9PzxnpWozzofeR/0n2czN23j6mWfGZX3N5wh4xuu4tH2SXhWpQi3TR3Sq12a5o8AozaZh1RuRwYegfb+R201sNpbQ6Rxj1MX+4DCjFdytHRQv5SWDlrsskYwQS5ROMvhOhSbJ5tRM7GzxL4tS5xqtuJGoWEltu6YF2N3pY494gHf2pozqbykkLa38pkdOsZmk87tcBSLTu9YqdJka6rewDhSQ6YjtbKpaEyXT3luIOebfOz9PG1XDK9WPFCe0b1LgCx3pRwZLaQSuwmRYT1h0WaVAQ0NR/USpquWR/LxnB62X6JPU4d91x2ioer9Pgp3WgvJAEPZH3slcu1dE3XjIx3FyxEFig4F6NvxLEzZtyBgBNuyHs1Ki46qStKCY8kD0Q9Yc1o2vRCEpsgXaBFcQpfZtudoZSKpXbnD4WfK6dSOVtQsHKFhy8pVc8dU5YSgiudxkIwvlu0+2xw+JOkvKmHPtiZzsxRJT+cbHCZZbn5aIxLDYq6yPm+TPN9j9LcY6wtnVCUxTOCfISWvTjbChoW4adQX0H29pnQAc4ve9aGVvSjsfkZ0hvCugpbvYKx/1k9EXDVnWEqY3AbrFRKai207RG8zRwIIphK5mnMMxScHPb75A5O9upWPC1U0rh2zg1+UO8quOE4gtLUIjbHXNA5wtogn1DfXH8GoSLeRL6hISqzS8camucU3AZrmSuCcxS7Db1Y3xJKumq1eRP/n4pOUhbX1Ug0rnJmbMgKeX9zU8X+leJVCcqQ7IgF71/4H6kxjDxSHDbBc5GhT/odgWdXVoxASvdh8xHacOqOA27dqoqn9TdmoRUOirw9zFbTH3CeGUEM7j6f+5z79Jh2yTiDWYigXarUvNrOeJ6ZHFmSdqOgXlJ3YkDwwqIHiTQUa2D9 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)(1800799024)(7416014)(376014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Aug 2024 12:54:55.2023 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: efd79f00-2d11-4039-313d-08dcc1e074a5 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: DS1PEPF0001708E.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB7330 X-Patchwork-Delegate: kuba@kernel.org The helper performs a FIB lookup according to the parameters in the 'params' argument, one of which is 'tos'. According to the test in test_tc_neigh_fib.c, it seems that BPF programs are expected to initialize the 'tos' field to the full 8 bit DS field from the IPv4 header. Unmask the upper DSCP bits before invoking the IPv4 FIB lookup APIs so that in the future the lookup could be performed according to the full DSCP value. No functional changes intended since the upper DSCP bits are masked when comparing against the TOS selectors in FIB rules and routes. Signed-off-by: Ido Schimmel Reviewed-by: Guillaume Nault --- net/core/filter.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/core/filter.c b/net/core/filter.c index f3c72cf86099..89f56fac48fb 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -84,6 +84,7 @@ #include #include #include +#include #include "dev.h" @@ -5899,7 +5900,7 @@ static int bpf_ipv4_fib_lookup(struct net *net, struct bpf_fib_lookup *params, fl4.flowi4_iif = params->ifindex; fl4.flowi4_oif = 0; } - fl4.flowi4_tos = params->tos & IPTOS_RT_MASK; + fl4.flowi4_tos = params->tos & INET_DSCP_MASK; fl4.flowi4_scope = RT_SCOPE_UNIVERSE; fl4.flowi4_flags = 0; From patchwork Wed Aug 21 12:52:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 13771399 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2040.outbound.protection.outlook.com [40.107.100.40]) (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 B6E69199254; Wed, 21 Aug 2024 12:55:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.100.40 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724244905; cv=fail; b=Ad2AiUhMUFocEX3qAP/3qzNWbwNSWCq+au5n7k/3ekUoRbSMl4hE6fMKLSHnrYtCnqvX1YrA/pSBTcnrLKy3hL6ckluMOR/1qvLflRY5ZMZ3n1y7jIsZd7OxvwQc2AfUtbb3E3+fIfrtKv/dbiI5gWQAentqLcYTg6t43eYdC2U= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724244905; c=relaxed/simple; bh=KhVJ6KPbI5VTPsJn+NMHoIaaboBc/pGI6rEL+SWDnpg=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=BhfNqVLeDD3R8UdXu60V5Iw4+ijOo3rn9A0faoF+njQ0KT+AgDrp7qfkDb0mlABYoU6QOUUcY5ubdh4qw03AlV/5Gcu+BdspG4Svg4wGuvh5wRok/qunodcbbDRJKYWxJahp3scHMFQOmnBsJ7PyzS2YLq0CKsH1OFlq6dvcfWQ= 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=GwNKsL5Q; arc=fail smtp.client-ip=40.107.100.40 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="GwNKsL5Q" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=KxRYfmAsXbh8ZuQEHvLeGPp+tmnK1aSC3zzS+huxkavrQ82zFsIlIfptZf5mtoWq5tQoq+mrr13uFNRd1IWi7mPbFCSsK0sqi3ONIw1qt+cJVqLuY2gEvfclJHpOE3nxbFudxtscD1VqU/yp/zWiBXRR5i06jOxE1wMacOEAnnErYTyh0Kq4OvGtgj3PLDFDQaAxEwHG9RzAjbG7zo06rEGKEEOv6xzxE6A/biEshhRXWXn4SnOm+FjHr53jtsLpt1OBXdkaMdzCk4BMe60fQKj1pzdy0Itud0qaIzfeVxClT+B/ynEXodbgjc+La2MbHLCxWtd/h9w6lvlGeXEOtA== 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=SlDYgBt1qrqJ0qeK7LStIxRtnKU/C9Hpp9kk7THx+OU=; b=iHiRBMwNVtNlNdsGuvM3Zdq8Iy2fJgS6nbpUHCsrkUeA2GdYqCH1gTBEftq+G2NWo/P84+4gXhA94XQoR34MkphM+VQiPRJrWsQe6NxXuXJtgssLTnKa7cOu8jA33TDcL5MzZGaajFb9Or3nxbusom2cm0jd7bvelDExMzS0ZE6Ube23zuPq7k0yzs3cee0eRhUCbdvItBtPS2a91pg5kVRLFS79BEcAcxAcnFEM+vbtZvUfFx69jMuHE8qJLKWVcG2xAYfpaK4bY1z/71h7qmTqS95o1+XClabS3CbsRs5PKH7SloEVn+55Io/+69CQH/ZLOQ2dFvpQf9jCF10yVA== 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=SlDYgBt1qrqJ0qeK7LStIxRtnKU/C9Hpp9kk7THx+OU=; b=GwNKsL5Qd0NC2JsoJW/hx8fSvcKpnVg+c5XgHa9OHf2AP2MvQpVPlA5A3Op1nWd7i/+p6wVJbLY2NCS0b8Ey1oLWjl5jAz3WcSU23GWdhmlx5IxDp2gpAe+c2tQV/+XhuMTncfRif2sD+i6w9irG02vC4VOBJ71D0m2SuDqAGmTRoIjKD1SYmGEQLotwC4snEFokIE4IeOZMSq0tQDVlZZkxp4ohRjAni/klKUQsGZpbkpN2bd76AY60HIQ9LARo0PFZYf3YVTiwIIno7X7Y1vS2gIDUmMuSgBG4Q98ogZS+8eCtUb3ns6rZzIxwwBQ34QQQ6lOV038WQMR4am5Qcg== Received: from DS7PR05CA0072.namprd05.prod.outlook.com (2603:10b6:8:57::7) by PH7PR12MB6882.namprd12.prod.outlook.com (2603:10b6:510:1b8::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.18; Wed, 21 Aug 2024 12:54:59 +0000 Received: from DS1PEPF0001708E.namprd03.prod.outlook.com (2603:10b6:8:57:cafe::e6) by DS7PR05CA0072.outlook.office365.com (2603:10b6:8:57::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.19 via Frontend Transport; Wed, 21 Aug 2024 12:54:59 +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 DS1PEPF0001708E.mail.protection.outlook.com (10.167.17.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.11 via Frontend Transport; Wed, 21 Aug 2024 12:54:59 +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; Wed, 21 Aug 2024 05:54:47 -0700 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.4; Wed, 21 Aug 2024 05:54:42 -0700 From: Ido Schimmel To: CC: , , , , , , , , , , , , , , , , , Ido Schimmel Subject: [PATCH net-next 02/12] ipv4: Unmask upper DSCP bits in NETLINK_FIB_LOOKUP family Date: Wed, 21 Aug 2024 15:52:41 +0300 Message-ID: <20240821125251.1571445-3-idosch@nvidia.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240821125251.1571445-1-idosch@nvidia.com> References: <20240821125251.1571445-1-idosch@nvidia.com> Precedence: bulk X-Mailing-List: bpf@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: DS1PEPF0001708E:EE_|PH7PR12MB6882:EE_ X-MS-Office365-Filtering-Correlation-Id: bf29eec8-7c0e-472a-b3eb-08dcc1e076ef X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|7416014|36860700013|376014|82310400026; X-Microsoft-Antispam-Message-Info: eaizPZ99Pa7eFFRJTod+H+69h9KRVu8KiyfilKJPwj7cG7WiHN/DE34AgwFwUqmsyD1w3i4tEjH5rRFO4F83/CEAF5pJ1xNVYmrDrZwAMKmjLpuh9Me6tfRNtCbS5tiKFtP0eTjAQYk4kx6Q3PSMKnZn+ZAz0tYBjOfCJgm/HLTAN4sV7WzhHHfYuSrqx6oPk43MLak/E639lFEgehoKa08q7buy6RuikR0gIGEer2qUMxbjEZaY/vIlJublQ6U9I03zL/2ljBslrMCH4l/KpyH5X2Yj+yZzBGwPSuwwXQap02UbBb7BbtrJr8cUbJz7z8HXdmCr02DriQMo8meOP4RY6tzuM5RtRNtoZz7NpqBW/XVcBfPJxTVrWTbpu+GfLKoxJ6YQDflga4iK6Nfr26tMVwSotX3kErQnedBJPSNd9UGxy57eAqCLGezocmVsCVIZeEs6kRhJ79X1SnXTHq5JDOEJ2lcWxna7klG2VsRPU9ZRwu4v3CgqRBRqfVHL1fEB1SPPgrIRlwOSuxmntH7dphbNsoCDYtBK9j69Lal4xbRvUME1cTsJfWBehKxq91yqsrTIinM3MG84kHpsCF96N3dupW33LSDQN8Fig9ZZdt1N/p/EamXenGUS5P8pKoNRk4YDiCG/gN4EadXNQEJ7kOwM374u1RcygEYZybRcfmBVsG3tA9z5kH9Ep6wowc6w6RcAQ6dArexUybtVuZmgYlobY0I4VyAymLGN3F8L3H4YxAVK9Q7PtDOeXewEbv/wMWAeLgapv8EEGaiiLwvENjBK+C6yxGa5jK8H0vzg9lOyE98t6APHR2EG5e0ZztrAlOdqGgUDSt2cQ8Elrx9clAKOme5UVXJo/fEHEUB8u96ppohrGpj+JgXDofE6JprHYNtPOxeHFE9M9G07wpQhExCL0lVh/ES5nonUu8f66ERV7v0LSrlglnpDtAyHn9/aklx+niyhPKafMn1k+R6rkESPVHEGVkWBZ7SjIViWsY4lVtFDclKWkRyTdFkHLOxM0Pyb45hLtDr4V8l6IlGPoMZHYIqCj7EnW3JxmQT0UDVDTDmmZPkyo/i0XIUVICGoVMvv+BmGpl80PjDoBQ8oiUlGPA31UaR+gBXXUVc12VSwKUU/7pxkLFy5w/rdLbQpS+AxaY2Yubv3pVhjsJF8Taz66Xo4OO2iXbOVIDm2vnTf6UbqrX47fdvetR+gc9dol8PUV40S+nVuByhsUI0u/OYdkupifYWmcwcJPIM7LNoogc6HVwJNeOEUbvUBPWc2hPoHeiSz6hw7BbTctoevAISJq095irumb9hgaHxGJzKV6eIkIvhGbO9HDB0vazZFET2/Y9Mawkqnhzj3ER7STjP7/IPPZAvMrfU6u4PJTRw0pRKzDJULvd522y/xDxIY6l94DdPLRBvxs8+VezEW0bCT9rpNLgHQUGx+A9CKyr9HlIg262Lrc/c7SKqd 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)(1800799024)(7416014)(36860700013)(376014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Aug 2024 12:54:59.0461 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bf29eec8-7c0e-472a-b3eb-08dcc1e076ef 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: DS1PEPF0001708E.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB6882 X-Patchwork-Delegate: kuba@kernel.org The NETLINK_FIB_LOOKUP netlink family can be used to perform a FIB lookup according to user provided parameters and communicate the result back to user space. Unmask the upper DSCP bits of the user-provided DS field before invoking the IPv4 FIB lookup API so that in the future the lookup could be performed according to the full DSCP value. No functional changes intended since the upper DSCP bits are masked when comparing against the TOS selectors in FIB rules and routes. Signed-off-by: Ido Schimmel Reviewed-by: Guillaume Nault --- net/ipv4/fib_frontend.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c index da540ddb7af6..8b740f575da1 100644 --- a/net/ipv4/fib_frontend.c +++ b/net/ipv4/fib_frontend.c @@ -1343,7 +1343,7 @@ static void nl_fib_lookup(struct net *net, struct fib_result_nl *frn) struct flowi4 fl4 = { .flowi4_mark = frn->fl_mark, .daddr = frn->fl_addr, - .flowi4_tos = frn->fl_tos & IPTOS_RT_MASK, + .flowi4_tos = frn->fl_tos & INET_DSCP_MASK, .flowi4_scope = frn->fl_scope, }; struct fib_table *tb; From patchwork Wed Aug 21 12:52:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 13771400 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2087.outbound.protection.outlook.com [40.107.102.87]) (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 0B8A419259F; Wed, 21 Aug 2024 12:55:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.102.87 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724244917; cv=fail; b=pcLHH4Q9PjKz6eTcS1Pis5j8m5KNMDQ9ViuaLR7jZTKK0oL4fO8ThE157ayGwzUF7a1mZfMUHv/Pw+I73eTDdT0ZY/KJjWO+WsTOQoM3Z41uY9sfDTx59EN/3zsUPYcS/cEaEGWIniITuRPnrM/1GkKKIJb019QwgjkyW1MF+ZA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724244917; c=relaxed/simple; bh=nxv0I3FxShIzkDqh7EPO7yngogz426b+AGsrPo0TQLs=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ngSiL0qVOeWHBcu3ziH7Ow5iF/2W26KBD9A1UkV3dk2NVGlrq+JmpW8mLwmORwM1beLQ6/Qvne6S4W6YJE1RGR6a4fnmvE0V17ofFMQ5bdQJFlu7t47uuPRANFBUNqtVZj/0UA817o6917dSMXHV1XUTqK4AR+gnBB+b57eGKOg= 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=dXtx21WZ; arc=fail smtp.client-ip=40.107.102.87 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="dXtx21WZ" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=R1pO/2rW1wsdKSPw02uZuHAb2LrvWa/RW6vvVWv3nBq34P5LNo3ZozQmVKjG14PbLYiGPYZjx710IpxEKgeT4WqdHKJtb9H27Vai7zmGFFsR18NQxwFxMLCHF9dHVcZhChgq32JaGxTsxX4EXGdTEu6PRi90g/CFp1qGcWaHR32r9ORAci3p2ncJwYozVaZ8/tVSJ9K4aYlw+NkLeAcbfasZEJYtaI0qw5xe8tasVfjkEqJPz0YpDMrwShV6bIeOAlqDppeBsSOkV9vMkoLhGe3jOB5JT97EsCWxlMWmjKY+TTtvr8XtQI6sIOAmodzrelNTocUFWex9E7ouz8Vn1A== 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=RbsujHa33SRowM94zpyo9pHEEx1bwuyvreMXZD5TDQI=; b=v1jp5hUe5OLHStVeT2MOarbF3xFOMNyJWPedLnIPh4cvdnKl7cSPO4LJzp9mp+4clUxZi6scUAO8hxGF0qloOFfbCJkPUb0FSvFO7ex46GAM0YTgHy+3eu45wCcEADNwR+/o+NrBNWlxTKVmOEYbdoRxeg/pgxR5aFiZ92dJAHu+5vWrrIKLZS8e/tYR5EEy8/0bK8AicnyEGUGkJFKFcgCKp1+Kt896AiHhe3I4GbvG7WlmwgRDKM4h8UT8NwJB3tMD0CTnguYwtvtj+5kb2x5N+3J7wPKPwO3U6PJeJoLfiogswf1ThgBPNVyzoYpV0eb/W379HcjvvswAkZRJnQ== 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=RbsujHa33SRowM94zpyo9pHEEx1bwuyvreMXZD5TDQI=; b=dXtx21WZrtKVtQBB8bIpOjpgANad5+s3Nq4xytV6OhCtNp73MEJEuuCHoI7J7VjV3Ywmaj9s3z7GuyX90fWqupk9e60UNwCr5txM2aqKOHulcY4vR64iXLGTbxpOm2jcW17RqScDp4OCmRxUZHT35IRDGRPyzGRPhx6FN8DBQS8h/hPlw58bfN4l6YxLPylcmAcvVQ8R3MlaMP5fNcvfPEM6Ai6LbeNBWmZIOYGrqCXoapE+5fikjmEpQojh7MEorCrlkFE6SwLAqiuzBxKyjC2t0pDkEQ7IZ0WZfo7yX+ODqM9ECnLtosVkQZPHVdtWlfSIHNA7XUrAEXnVKKETug== Received: from SA9PR13CA0007.namprd13.prod.outlook.com (2603:10b6:806:21::12) by CH0PR12MB8485.namprd12.prod.outlook.com (2603:10b6:610:193::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.16; Wed, 21 Aug 2024 12:55:12 +0000 Received: from SA2PEPF000015CC.namprd03.prod.outlook.com (2603:10b6:806:21:cafe::1d) by SA9PR13CA0007.outlook.office365.com (2603:10b6:806:21::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.16 via Frontend Transport; Wed, 21 Aug 2024 12:55:12 +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 SA2PEPF000015CC.mail.protection.outlook.com (10.167.241.202) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.11 via Frontend Transport; Wed, 21 Aug 2024 12:55:12 +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; Wed, 21 Aug 2024 05:54:53 -0700 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.4; Wed, 21 Aug 2024 05:54:48 -0700 From: Ido Schimmel To: CC: , , , , , , , , , , , , , , , , , Ido Schimmel Subject: [PATCH net-next 03/12] ipv4: Unmask upper DSCP bits when constructing the Record Route option Date: Wed, 21 Aug 2024 15:52:42 +0300 Message-ID: <20240821125251.1571445-4-idosch@nvidia.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240821125251.1571445-1-idosch@nvidia.com> References: <20240821125251.1571445-1-idosch@nvidia.com> Precedence: bulk X-Mailing-List: bpf@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: SA2PEPF000015CC:EE_|CH0PR12MB8485:EE_ X-MS-Office365-Filtering-Correlation-Id: 869b9345-f7e5-4ae8-e489-08dcc1e07edf X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|82310400026|7416014|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: u1rPZzMGndltSO+aLtU4HyQyQ8NNO3iJPqlN7ClMItzPwFSRK9UcML1mP/er7SNq8iucgJY7bYF5zYLbtHZwC6QNReO5J4OpDrLiweKcJEpMKkpUv1lY2fsHqUDGT57H0jqKDorrU6F/B9Q38DTRED+O9g9/x02Wp6G/GNngaJz/68+hHSLKX9KiW5yGaLQ8G0EvaU6fENoHivq49PRADiieoVsGhY27jxv+Bb9XbzUAeJbdOIw4zLR0q0/r/iyZ/UgRlS7kk/B0izqoIJvMKjjiEyhGhrVU4fL6mCoyv56qX/+VNhL8CRMawUnumzQnhzNSC4wT6XmRZgu7upHRg51VIwXBO+UDInqjeuyxp2CHQup+AcOFkgiz/9uuM7Utx5HGsUIjFoGuMhA5JKVmxZIjQlI3+eIQj+BmYI4WGdjKLHmGB4QQg8czDB+jA3PY+iCVAn7OuogApxkUOPay4sbTH8RrkOwfxt18i8EPP6i8abs1zSEZBZfPJkhxNlMM+NIWmrH/Umu3Z95hvxDPXF51Ja1GvQJw7AQTOA8ILoEYA8iH68da2AK1jCQtG5+AWHpWKfi4O2FJ0p7c9/RVAgaiCysvTiPvDU254Q38f9J94nadthu1PlfuuERYXL+UrflXEzAo7lcqNyiaJ//WlbYkwhx12HwsN3QXZX61hYfNn6SxTS3g8pj3uz20wne+3oi3pMOpZghnMgWbx9kpxWthxIOG7nqb1vO1tNyCwb2I4iaTZgedN/5cBzsa54wKeELj73HlAuwuC45lys0kQ8YkX41DwRDQfHLRuD8fJDNfj4CwP8wNcAph/hN0f9WcW4VX8+JM6M4AeOrF/GKxTD8kjyJ/e0EGRRwcv4iDPjaLMMWyl3dClP3z8uuD1kwBRwYjXDXCd1mGYRjrcPAU6w0S9VPQ6Tkioeujx3BuK4AJBvfRkWLu92Jja/DOvFkqyg+z9oCUym/lD7NbPgiIHH5aLKXNMI0ZJoJQ2MbdJDfCvPZ4sdqRH90QF+sdLb5tr42U40QHdalFo/3IUe7jepbZbYsgU9AxkU5pESIBSKkgFFGzikRM+BtHIhgFv8j3uKDeSlHCDv0kzy8BsI9Ic/Azfj2o3pu3s/kH1UMKZ+fNDl/n2XW30aZbaOMdnJQlYmIbnMDw+S4iV2+gzxFh7A1TMqYcuSwHb7ApVmQ81zZrinX6jZWbfLzp7Bxo4SZBpsMnLb4DUuI1lN+q8svIV4R31fbYv+YFdWGll7alPrcLZjreFBdK5W2zgB3+NDvm8Kc8tx6iFBzOL8IntZEnagwL/vwZ7xqZWQi5/U+DTjxJHKMf+eN/UHARFUwFRcXJcVdOmB+5V/orreAb3Fa4u7EWgpfVeowuKP0yeAypNxdQyGN0Uiq1zKXC5pNyKqDDzc0Ho2xIU83FiC/Hrzeu30AbSnp1GMKkoc2MoLbZAJA= 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)(7416014)(36860700013)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Aug 2024 12:55:12.3798 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 869b9345-f7e5-4ae8-e489-08dcc1e07edf 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: SA2PEPF000015CC.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR12MB8485 X-Patchwork-Delegate: kuba@kernel.org The Record Route IP option records the addresses of the routers that routed the packet. In the case of forwarded packets, the kernel performs a route lookup via fib_lookup() and fills in the preferred source address of the matched route. Unmask the upper DSCP bits when performing the lookup so that in the future the lookup could be performed according to the full DSCP value. No functional changes intended since the upper DSCP bits are masked when comparing against the TOS selectors in FIB rules and routes. Signed-off-by: Ido Schimmel Reviewed-by: Guillaume Nault --- net/ipv4/route.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 13c0f1d455f3..9b6528b7b562 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -1263,7 +1263,7 @@ void ip_rt_get_source(u8 *addr, struct sk_buff *skb, struct rtable *rt) struct flowi4 fl4 = { .daddr = iph->daddr, .saddr = iph->saddr, - .flowi4_tos = iph->tos & IPTOS_RT_MASK, + .flowi4_tos = iph->tos & INET_DSCP_MASK, .flowi4_oif = rt->dst.dev->ifindex, .flowi4_iif = skb->dev->ifindex, .flowi4_mark = skb->mark, From patchwork Wed Aug 21 12:52:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 13771401 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2071.outbound.protection.outlook.com [40.107.100.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 974D8192D97; Wed, 21 Aug 2024 12:55:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.100.71 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724244919; cv=fail; b=FbE4UnjvTYNixAgA34ZQnnbGczTsDBCquAC5uIOQWqkTUqaNkKHZkENuoNPFoXvmeKIEE4mBoYtlZ862qqXp/cbUpPdi785ZbUzs/eTUW8ZY4YxsrinVPrviB0pSK2HObzVqT3r1E0o4fv2hDWXE0VTVHBIWhRIYeLl/Py4jpC0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724244919; c=relaxed/simple; bh=kHPA7iNwZLZas9TVyyKp3U1hirkIFgJGpzAv2pDtZ/g=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=DLiE8QZBZQuCWvdsrsIjLGSv9DdL6xu7+4VtMrLsMcsrkrwitT8DSgPW/R0N/U1qZRJMRD4LvFqfH6FtTBmaxtXAuFtw+mdkiTNkA/X8TuxmG1UkISHt75MubP6wL6L8wFVXPxD7dcCf7aAYibjBl+Zrn7xYbyVXpkCNFTa0TMA= 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=Vylzkzpm; arc=fail smtp.client-ip=40.107.100.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="Vylzkzpm" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=OBEoCMmNaIecplo4qmVUhkljktwqLsQNCYhrEZvuT7sKy4ki9Pa7xXadpXCmQW4K37FMT15lCbfsktq57WR3RJoDd0IWhNJj1o85NmproXurrB51kQrQRl2yfdfr3Sm/DyzsRqlIFlfMUaZtuAKcm6EzBHIO2SXaTvmIEAzKyVYmqvm5XvQGP0FhMetdOp97zjEbXhlvAMzGgHuer+JQKnnuyr53ZXElJ3ckzQWMcw7p0QSXGwTAY1m+QVM2xD090auw20/t//RXBOCtge/F9h8MaXxcIs6BDNuF9U63OSob4eX0MTEX6lobi//9t8buZAxXccGVJkqc3unNHLDhUA== 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=ld0/Pj3CceHcy2iKcEKlASK4iw5jCzUbImP1F/Ar3L0=; b=UyGWsPTY3Nq347qpsBks6rFoTmhX39y2mjLWi1v2PPsKEBFhmVMWzLXZw9xEZk9YWFl29yXY6PWg1nQ1LlZGt8B1pdKHtwNKiwwWrNPkFz8mubT3E3ZsE4PBOrWSFpGKNB+A/vRmtBfPUOm5xDwGZZ/mhz0gcedjKnW+26ZGgyXzSeNv9sTxkFNT7MrB/ZZWWErmUxcbAWHhSaQqb+MwZ1mBrcLZhxS8lFwmJzjfn4HgGJd2swNLT+B4SjeiFLtKyIkwqAzPHEcmBm7zC80kJ3qVzdeheU7a6ezycnqqna6KB4laAD4ibWwptbyqeXluqjxAul5zHbvYf+x/W1SfUA== 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=ld0/Pj3CceHcy2iKcEKlASK4iw5jCzUbImP1F/Ar3L0=; b=VylzkzpmOCOSjoVISpfK9/DAzLLfgvAGYFKckplieGV6Nm5kNAePs7/9cscupZcw4//hBfSWCPIyZAspcgByhDjQKvtSsIkLDB9ieH5jGv2eRYHtef4Ja4bYymi4gnwqUE6Cd03rwb5iK5h43NDL1F8fVJIuUFTNDKb/9ckyIj9Wtklp7nWYgut6AsNGAAiufvdCsXMg5EibUpyQPRMx+S6sJpwgGFCsUB55HeLo8yLii32sdLWZrkhuqk7KvvOpj9DPap7JG9Zn79tYKGsLR5ut4az3/pIbdGcoXzxug1cVPZBV0XQu8l1JJrmi/uPd7KN5fsEHAxPe/wEtruk7Zw== Received: from DM5PR07CA0090.namprd07.prod.outlook.com (2603:10b6:4:ae::19) by DS7PR12MB5741.namprd12.prod.outlook.com (2603:10b6:8:70::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7875.20; Wed, 21 Aug 2024 12:55:09 +0000 Received: from DS1PEPF00017091.namprd03.prod.outlook.com (2603:10b6:4:ae:cafe::a) by DM5PR07CA0090.outlook.office365.com (2603:10b6:4:ae::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.16 via Frontend Transport; Wed, 21 Aug 2024 12:55:09 +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 DS1PEPF00017091.mail.protection.outlook.com (10.167.17.133) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.11 via Frontend Transport; Wed, 21 Aug 2024 12:55:09 +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; Wed, 21 Aug 2024 05:54:58 -0700 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.4; Wed, 21 Aug 2024 05:54:53 -0700 From: Ido Schimmel To: CC: , , , , , , , , , , , , , , , , , Ido Schimmel Subject: [PATCH net-next 04/12] netfilter: rpfilter: Unmask upper DSCP bits Date: Wed, 21 Aug 2024 15:52:43 +0300 Message-ID: <20240821125251.1571445-5-idosch@nvidia.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240821125251.1571445-1-idosch@nvidia.com> References: <20240821125251.1571445-1-idosch@nvidia.com> Precedence: bulk X-Mailing-List: bpf@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: DS1PEPF00017091:EE_|DS7PR12MB5741:EE_ X-MS-Office365-Filtering-Correlation-Id: e82728e1-2d53-4b47-abbc-08dcc1e07ce5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700013|82310400026|376014|7416014; X-Microsoft-Antispam-Message-Info: qTT93eA3HlPqBPziS/PP38MkiwgFZVBwEKhddz7Ebre/bK9hwxb7lVuohum787nkzLEZ6gKL1GNivXOLzaertelD/e7bmwNnJDPJhOZJlj4BukU7eQkJW/Rxq9iLPSoc+4pfFQh2kXcASbBvdHmefXMaoN7cc9eSG1OgYXWKL68cf/GBF4xaymMFs+x5MmAsVKUtt4KOWMOSF2N3kCtwrzvfBaTVqwIqwyhdRBK2MjqMG1n8ppAiBhDOyn//MujbTiE0nvl69J4CLNyvCICUgPFU9OGEqx91PbERo0A0KQcLmVLYkkrQOkpsCAQv2tWz829yHxKkkxURkxn8LGc35zCSCNKp6Are3kTJVWdJKX2xfO7huFovufbZvumR1v5NzCuVZUjjMII2kX6+5IIfvBccGQhxHZkjbPw+zESTjz5bYT5VLw2xSrCCJG7Akp7Y4jsb8cYDolcJx4BQy3AsD9WEjjVRSyLA65Zzun0qUatNkY7lh3A6iNoUPl8b2j1LQy33hC2HLQKwZvVByxYUpWoHkchoUIi+vdrJpbw5CtAQ/2rTHCQfBg0VbO5oXBhkh5rAMGCCjePqwe6UNT2ssswnbNstU1lacyKwd2UqbN2datOfxh5xpaWlNMN+kZP6r6XP+T58Ycmk3oCYV/IxZwpwSuXMaDMCRZAqCBi4v/u6Uyu/abd3iAyiwmglZHk0chVacSwSv6gl3pWC0Tm5U0VEqdyEMzsW6hB9XvZDM22YoSMkG38col873VuHQ4GC1vSS5LN1QOE1cf/bnu9jqUNyNJowinoKRxqU8D5OPM9Tn1CoUPNzuTVZTfdbEMRYUjpDEVQn9n9463/foZfhEDNzkVBcKvCURWMAlNoPyhvlA8RJrIIUFgkJPScq9rPB0e0a+ogGQwklnp4fxOz9cGxlCFnUd4s0FLjdIoR7SqcdafDHZsv9yJ8kyF0K5CM/w2KpSaGtaOBF30iHES7U7u6L7v2fRgT2FqxEZy5BcHzgVHTokXJs8yHaGO7EHRo2Wiq+87zDiX1vZe8aBZrQoXJdmAjI0iA17LOrSdr6JoSFepe4AjK4Ehr3mjRktT74E3+/Jg6dnxh6Uk2QvS/+cg4I1DXYV94z4yZuhYZaz814ELWJIhcztdxz3T+pUW8OVgNBXpm88Qd3LGTPKL6fvbGHjLnDP1tIjS1vA2ZqQoXZJ0gvuaEiR9ZrLLGynTQ9DpurwGS/Vqy7gpkHPMdsHF6qYSnJuaIOyZSqYQsmfzHtiijMzwFmUwLXmA9n+3CDnZdzu8L2B9H6TCp+U4nSDXyuT8SZVzaUkfhS9AUxBhrdyP/9zMj9T2oqMB18+FxQS9PNqt02bx8WIezsHbjn8dSCa6Xb798aYMSZp7FnJwX6WzstMOO6efAIxiStS5oFdA2m0vK6GSOMXwlWIu28C+jbXNs9jnUiMB+RJFhEc/4b+wKDB3zybAnSHmsd+mHD 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)(1800799024)(36860700013)(82310400026)(376014)(7416014);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Aug 2024 12:55:09.0466 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e82728e1-2d53-4b47-abbc-08dcc1e07ce5 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: DS1PEPF00017091.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB5741 X-Patchwork-Delegate: kuba@kernel.org The rpfilter match performs a reverse path filter test on a packet by performing a FIB lookup with the source and destination addresses swapped. Unmask the upper DSCP bits of the DS field of the tested packet so that in the future the FIB lookup could be performed according to the full DSCP value. No functional changes intended since the upper DSCP bits are masked when comparing against the TOS selectors in FIB rules and routes. Signed-off-by: Ido Schimmel Reviewed-by: Guillaume Nault --- net/ipv4/netfilter/ipt_rpfilter.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/ipv4/netfilter/ipt_rpfilter.c b/net/ipv4/netfilter/ipt_rpfilter.c index ded5bef02f77..1ce7a1655b97 100644 --- a/net/ipv4/netfilter/ipt_rpfilter.c +++ b/net/ipv4/netfilter/ipt_rpfilter.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -75,7 +76,7 @@ static bool rpfilter_mt(const struct sk_buff *skb, struct xt_action_param *par) flow.daddr = iph->saddr; flow.saddr = rpfilter_get_saddr(iph->daddr); flow.flowi4_mark = info->flags & XT_RPFILTER_VALID_MARK ? skb->mark : 0; - flow.flowi4_tos = iph->tos & IPTOS_RT_MASK; + flow.flowi4_tos = iph->tos & INET_DSCP_MASK; flow.flowi4_scope = RT_SCOPE_UNIVERSE; flow.flowi4_l3mdev = l3mdev_master_ifindex_rcu(xt_in(par)); flow.flowi4_uid = sock_net_uid(xt_net(par), NULL); From patchwork Wed Aug 21 12:52:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 13771402 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2075.outbound.protection.outlook.com [40.107.243.75]) (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 6835818FDC2; Wed, 21 Aug 2024 12:55:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.243.75 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724244927; cv=fail; b=C59tRV15Q4aSKtbGtNYRlm5snomdTuBtjkLA+E0yzMdLFSHRDhkgTUpHtIX9AYnK14zdR+aM0YMxSxoeJq+fNERSj+pQ8/EwJKG1/RHX8ekF/QKxgGcYXU5nEbds8Ocyfv9u3MUqkM0qjJPbhxCIfJw2mh9ENHFI8t7l/PoJemc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724244927; c=relaxed/simple; bh=tFfe1m1phJMQAeHy0OTTn0InTibgNkWbO5yfLrZJ4VA=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Z4vz5Tkw0YcH0a9cJk/AgVzqW4DDcbm4mVT0daEhe6gawamn2hBTlUXwN7pK1YeoQ949AtWGRlXCjitF4UBqpIf65EY6ju7gfAWvZDn8WLRgn34EyKJANzpH7yVV9babTqSmW76S/gXJZLwS8SfGLgnA3BXehXxwkkB/EHW+U78= 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=UrqK9lOh; arc=fail smtp.client-ip=40.107.243.75 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="UrqK9lOh" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=yI2IrvoyR0tUNq4C+mhN1pdhjKnqwjw/SAxMh3JQIMrqqfM4smmf2R2YtEpwqhTaJ/1+EleXs08/fFMCcoGQTY0dDMQiSnLVViAGcNEkcsw62PociPR+UaDelgletgP67sWFgBhspb3MauI8VNU4dbRdlWZCIHP/gYBAedqVgM2/lw8HNtAhOkE5FRHvGnV1yQIzC/rPrcsCn/H1pQO1xSSi3wioJ7QGVnjeq/Em11F5Qpv7nemMsmim3uKvQoIAZRIqbxeXPvK7haEfYeh8X3HV0x68+AFCHoA70Eufa+vamspeiGQP7oLKFFb1XncHc8qmGkQXZg5A+zzAeLwrQQ== 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=ttnnAoH0ChuxN0hsf2yxSrdVVDBZKnO8NUsYq+YYLsw=; b=PZh/M3JeacQRXPxZWiW0v75rVKwoXZfKcAHlMvfgwWBMTr7BjsvdXXVyFsrpYzkF5uNZCAwkjKuwgrMX3kCch8iLZ/OuUJW9tUD1/TxPz9n1NLPFF8s0bsui98QEslNJ8ABda0v3W9udZ6LcmPO1ADVeQ4L2A/q+eQ0mGccRZC/fC4kYHLzue/8lLJzqLdblnQ5Zr2A7Lg0UGyCT5DkYhi8Isj+WEE0y0KFpDNhQIEEHqek8Zi+LbmsvVTaOMcmyhpJsFM9v5vjyVQTYnLo3DYU4VsibqZXFTSYgPHdN81mTI1FF7ilUqfLZf6f73UiA0hFOCMIgKe38DbYGv8bxQw== 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=ttnnAoH0ChuxN0hsf2yxSrdVVDBZKnO8NUsYq+YYLsw=; b=UrqK9lOh7EMTOmQ3n/OKEIdng1KwBY+RyJybiCOYH+z6JKRN47h1kPdGBE6OEDxX9x5et9kmYs9h8bwGSPuyeO4+2VC6Jm5FkoorrXycqzygS4Yf+aRYuDeh3H6c1pMjb0fYTbUTKObRxPbFqEl0kSVqL48vwJqh4Nyb6hhdqFp8wqVyXVAlkYQciljoBeQeH7xVxIZomlR74oJmyOmn43rsYQUV92pauXC/U59QgN7AfophzIbr+WvM46RhQ0L4R5hnEkJIpuB2N9s9XBxNPaJVb4TxkdtI8hf7RN2ZkXU2VNq77sBvSBBJpfpy+B+gDiiuRjLxeJ+jDrx6nz1/hg== Received: from SA9PR13CA0010.namprd13.prod.outlook.com (2603:10b6:806:21::15) by MW4PR12MB6755.namprd12.prod.outlook.com (2603:10b6:303:1ea::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7875.25; Wed, 21 Aug 2024 12:55:22 +0000 Received: from SA2PEPF000015CC.namprd03.prod.outlook.com (2603:10b6:806:21:cafe::77) by SA9PR13CA0010.outlook.office365.com (2603:10b6:806:21::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.19 via Frontend Transport; Wed, 21 Aug 2024 12:55:22 +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 SA2PEPF000015CC.mail.protection.outlook.com (10.167.241.202) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.11 via Frontend Transport; Wed, 21 Aug 2024 12:55:22 +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; Wed, 21 Aug 2024 05:55:03 -0700 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.4; Wed, 21 Aug 2024 05:54:58 -0700 From: Ido Schimmel To: CC: , , , , , , , , , , , , , , , , , Ido Schimmel Subject: [PATCH net-next 05/12] netfilter: nft_fib: Unmask upper DSCP bits Date: Wed, 21 Aug 2024 15:52:44 +0300 Message-ID: <20240821125251.1571445-6-idosch@nvidia.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240821125251.1571445-1-idosch@nvidia.com> References: <20240821125251.1571445-1-idosch@nvidia.com> Precedence: bulk X-Mailing-List: bpf@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: SA2PEPF000015CC:EE_|MW4PR12MB6755:EE_ X-MS-Office365-Filtering-Correlation-Id: 03ffe3cb-6fdc-4fac-b5c1-08dcc1e084c2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700013|82310400026|7416014|376014; X-Microsoft-Antispam-Message-Info: KlUySpFFQbaP+GEt0rEy3a8/9biH2w/aM8XYppiAPClqt2Z6GxidZW+3N7RZyBU2wH/jAItGoHzJ3AbhdFQPF39CvBN8Pi7SP/u1sRYDNp2zpdCAO37cIaW8RSBh3PFXeWcMEgCmoQHKIxWuGssRKia9ix1Obl7oPxvHYcNijyz29diwlnY2ft8uqCQ+2pll5WNJN2jjYhWoqebny9Ztll80qxZ8EK9uuPkdlX1083afx84OM65RAVFwMFG/eLxWdvEoYDB86vYAso/zay30owfxCDT9mAocq7ta7tDDhynDy5lBRWOwr2fdFKhf9uQkH1T+QbSAaKPUfeEucuBD8xPToAqvxGOOgbfsZmuyOw1Nuv/TC78XVlfZEGEi2R63+YAs6TVUgu1ASbwNSc7fL2eyo2lO7Aucs29LGlz60A9bwFGM1YWIOtmnQ0XUoNzOPN2n1Wan9InftAIdpZ9v9vbllNdv5JiscNNLKn7X95zq3o0iGweC7edE9M6wAPcXKhrWYjhPfJ251U+F+tO7WEi8uHo5wrV8DuygRNYyy4s7gre+N7fljZwPkoQd06jHmK3/B1ZEegMsg42elPrlsTSDUHDj0KyCI+JS9WBnKRlGZpzm1lyT1hGKXNs3aGizSsVoQ8kAJghDvIbWgT5AQh5Ljag0VEWVTCJkp/z/O87AGnd7tYttvMgc/YJ0yBE16bl15zRCul7wS6ARORo4ZAwwPXszyq8YH+0UE3Vc9XQoWKwcFOLSilu5OWGjgdEv05VIgWdcgj0VQfKcAOUn4ANgvL2VRMJv8mgKCWT1X/14anB1qVGtwGG5WHO2I61TZQXnsuVE0PvoOQkdbRyHs3Mvzij8ICe0qIZJObPqQek+WS+55S5WvEQnlArXIDc0n4/0EFEmGyNxaFruIh0vTav8Gzdv6xiRULRpTI/cnoEJT5qdMuc2nU6I4MHrOHSbyZSd37keNrdVXhS9nAKxJHfL7sEXtNc6hY/s7FwL//51lneguni6NPtoceDVIXLeJza7ZbFDNd7GuD7NvsVNH2cFHrGo0wVzC7+8jqL6KrOwXgVXHjgWGCkqH/753SEeKYxhflKVvS8MrRb4OrvrCO6rWEpXLkD5mjghQ4n1PpVNZNStbtDHnWwk9ZDusJQXylSrpjKaTvxPx+Q1iMqZSnA/ArmuFzYyattqPxRrLv5xkdu6kV47mbbJP3v2Lf3KBHs3eWe82N1KDLsH8/tzLXWJN1O8MKrhmuZ4HknkhvG/nU9TGWclTM4TiwK275ShYpAUQmUvA7VlBE4f0tGmH1Xl6QyY25KIBcdefWku8TIw6zrpdacieoqIIEDeYrWbmLg7rew12icDEYnx/pD8QukYEp8/366E4Pa2ygVg6PpsM2skYqfsC9qpTsHxQ7EsP2CuzHYdc4fwus/MzJgkwnhO+DReR/Mt5Edg29SbWgmFAFKA+T2Dbx3/o9+V6QFx 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)(1800799024)(36860700013)(82310400026)(7416014)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Aug 2024 12:55:22.2393 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 03ffe3cb-6fdc-4fac-b5c1-08dcc1e084c2 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: SA2PEPF000015CC.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB6755 X-Patchwork-Delegate: kuba@kernel.org In a similar fashion to the iptables rpfilter match, unmask the upper DSCP bits of the DS field of the currently tested packet so that in the future the FIB lookup could be performed according to the full DSCP value. No functional changes intended since the upper DSCP bits are masked when comparing against the TOS selectors in FIB rules and routes. Signed-off-by: Ido Schimmel Reviewed-by: Guillaume Nault --- net/ipv4/netfilter/nft_fib_ipv4.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/ipv4/netfilter/nft_fib_ipv4.c b/net/ipv4/netfilter/nft_fib_ipv4.c index df94bc28c3d7..00da1332bbf1 100644 --- a/net/ipv4/netfilter/nft_fib_ipv4.c +++ b/net/ipv4/netfilter/nft_fib_ipv4.c @@ -10,6 +10,7 @@ #include #include +#include #include #include @@ -108,7 +109,7 @@ void nft_fib4_eval(const struct nft_expr *expr, struct nft_regs *regs, if (priv->flags & NFTA_FIB_F_MARK) fl4.flowi4_mark = pkt->skb->mark; - fl4.flowi4_tos = iph->tos & IPTOS_RT_MASK; + fl4.flowi4_tos = iph->tos & INET_DSCP_MASK; if (priv->flags & NFTA_FIB_F_DADDR) { fl4.daddr = iph->daddr; From patchwork Wed Aug 21 12:52:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 13771405 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2059.outbound.protection.outlook.com [40.107.244.59]) (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 B81E8199944; Wed, 21 Aug 2024 12:55:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.244.59 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724244938; cv=fail; b=MbcQi67x46C/zC1wOwpky6zzqzgqzDMXlPJKZ3vFXIm4jlQUC/x+0a1Ky6lyQPs828d/ZVM1JVfL9/wm4Yx5PpzdqWQQP8yCteAsXlKEB3Zvvs/iWDgZzqejy8EWxBmdWf9oC9LZZPsKOTtP11S5AU8rV/9afLfT4mCOnWLj+WE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724244938; c=relaxed/simple; bh=rfhVXhu6QFDE28XK8Nege6IOzpxnYynVh4Jn27fKWAk=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=cqPhitgqcL3s4SKTvzTfV0Td5nxHfseBnnfXoVQuL586MTCwGpOUm5wO87D/smtLRVPlb7MxNlTT9lYSMIy78DrdhoP/wm7YfplfmhQreD8UwnuBz2vXKlgxOeJ/7TWYwU3Ir0KyadcRt5f9P1FYc8c9QdiL3B85S2+lYR5IPyg= 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=EcZRSpGE; arc=fail smtp.client-ip=40.107.244.59 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="EcZRSpGE" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=dbEALlCePT44W/mTaDdbwen5Kin+OsALBNgUkrhH5hp/NBS1U9Fxz+6CSCMSVOZCiWbOVpiEQfhSK1j6cng/HiKqnEZFaATZfz4zDOkXhBU1n23WfgoGstbX9M2qacIS35pGjdn6ryyl8v2Xv9pSkiKPcUZ1XACqjiJk/la1WGgV2RBNRH7ZqcN0WKYFtdse9oMCfE8AVI2X/mcSM9EoUjnLz9Givf/RrPKJ3WMwH/fLpCFMnbOgcYVn5nkZOrtxx36BxrQRPtN7SY0K+6eKqz+t4xaSOLYU3vB67UH8VgDLhTJJ3IG2Wt55hOf1iTBU+iqcAhLIv04J7m+nER4Ftg== 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=L75AY9HdQyZxQKxk+MHTelA+77qU3H83oviLZjg66LM=; b=hmrCUf9RusNES4wkZVCSeLLguLSjKWJJRKLGBFbd7MnlpMqgOT3Dx4AbElAUxc2BpQhe14rOQIB7dzUVkfEh5uy0qmeGcBKomudvQL6Y5laaKG901CVS6MQTQhiN2eY060vQiKRw6FCyJp8nEx5iNMbbZwVqpPUcNNjQ3dipG2g8dQulPobx22iAyI4x7zbaPMZBTyPoZqGXF9dOEze/f7ZA+PRQb3hTNnltHK8Rg2nkJTzGsiGSPQFXp2Aju/QOqhQNBd0WmmQ5r7dkFHfaRd6xCnZuAdcnj1FK0SbtI6hx9/3WTZCvFTLaWZt6QL2aoD2te+VUN1kvSAElodJz0Q== 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=L75AY9HdQyZxQKxk+MHTelA+77qU3H83oviLZjg66LM=; b=EcZRSpGERPLBPBD/70/gCTNnx0iYJRJhjwusFp48Rzy/frvuzdrFKMMhibpzHLsyS7LPBuOnhEguOWQZAKEpCyezVdaFUtG/zAb5SbU/8uJWhuZxzPnuVH9uMb63AwgRmYy0AsIdWILD/s/qpg2/aoVx3IL74kF601uo/xl4JaW6IXU8kdSX9cN2zfKDaLbckvCcjBDQKtYfNb269T/MioDQ9jwfiDMTDuo8Rhz00S4LJQ56rabx4NhkHhpXPunMQbQl2YWF/6rNETXiLhrJDID7bPKtefxaLAcDrxHq0ZcNj5/7jg+P1KrxjAC4nKQoRAY/NTVV/6oAkloCfmqMrg== Received: from SN6PR01CA0006.prod.exchangelabs.com (2603:10b6:805:b6::19) by DS7PR12MB6071.namprd12.prod.outlook.com (2603:10b6:8:9d::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.19; Wed, 21 Aug 2024 12:55:33 +0000 Received: from SA2PEPF000015CA.namprd03.prod.outlook.com (2603:10b6:805:b6:cafe::7d) by SN6PR01CA0006.outlook.office365.com (2603:10b6:805:b6::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7875.21 via Frontend Transport; Wed, 21 Aug 2024 12:55:33 +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 SA2PEPF000015CA.mail.protection.outlook.com (10.167.241.200) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.11 via Frontend Transport; Wed, 21 Aug 2024 12:55:33 +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; Wed, 21 Aug 2024 05:55:09 -0700 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.4; Wed, 21 Aug 2024 05:55:04 -0700 From: Ido Schimmel To: CC: , , , , , , , , , , , , , , , , , Ido Schimmel Subject: [PATCH net-next 06/12] ipv4: ipmr: Unmask upper DSCP bits in ipmr_rt_fib_lookup() Date: Wed, 21 Aug 2024 15:52:45 +0300 Message-ID: <20240821125251.1571445-7-idosch@nvidia.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240821125251.1571445-1-idosch@nvidia.com> References: <20240821125251.1571445-1-idosch@nvidia.com> Precedence: bulk X-Mailing-List: bpf@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: SA2PEPF000015CA:EE_|DS7PR12MB6071:EE_ X-MS-Office365-Filtering-Correlation-Id: 412209b3-3db8-45b7-1e56-08dcc1e08b59 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|7416014|36860700013|376014|1800799024; X-Microsoft-Antispam-Message-Info: oddBt9kE4LhpqHM7VIYfJpVKXbQSF0JowIvHQxV0YpPE/KkIwYiy5PW8TBO074CaF4qE7o+STqlQTbrR45F+1rx73grFF7UFwQAE3l8MKL1vvWu3jF/Og9jq8zt65l0yxnBfwGS7xEHLHmGnnsjTUgwZXxapD0U5h8+PrHsYRmes3A+pBfkzbTeSvsfFIKIaT7Lzp96GBSczeWdbcuRAWhk285LQh80PPxTENQGa+t0Z0DbBa5KRh8mrMkK3z5CrJrW5fjaAo0ILLtmJWN/ZrEl+lCJAx0DoyiKuRzCH3jsWZt9/eaAPtdvHBfPEPNS/OU8U+OPXlixOGrSE5K7CMeuE741b9jbZtMbHaZGXrPK5ZOe6z3NjRQyilltyil3eJWdeTJP87dJFFTVo/9O6pY6l8z7Xh6qkEDnVdC+DoY01AqBOUbOm9h9YZ1PQgITJwkkbkygEK/idCqp7kMUkiO2mC1DO2JcRwrHSq3JGB/W67IeRZmpdned0NeyJJlrX8lDJjHkv4fMlK0REul81ugCBKSd6QIEVZqTXd+dOYj1fr1yB8mfoFrIRaefMoUhOBGLQxR3fTxWIoUaMsaZ399I9EXwZ0Z9OCngiKq3rZnjcYv0v82m+jlGVkJSbpReTI2OoCEkbFr0Na0eVDO5OZJpgy8jcDz1kvGDomEwLVYXuR3D1mKw1nK0J9Aa3VPQ732hz28KFrITjrph84Rw+4vTe9vaSu+pVf7MAXUs0L3rTQJErp92PLK1qSzrhdwd7geuospgtzfcdPk+M9b6rNzF+Hx5O02E0AmdOZYzqcqthEuR8k7LF5dEU9S4zeZDdnTDM9V0+I7zMbVjwy3pMtrqUym/3qo1eOvvD4O/beShoH3ooatQFfZkvGr2/Ovdk/YwAXrq0x9vLHDEnNnGg+M7j2FLmOtnUUf3+OYt+KV2EamgVjyQMwxPLYq2Ol/4qG7ugZsQCHW4p/JnoHUQU/RRPeLVFGWJFWauRsiqGHSiKw286SIcVoo22iyvJaqT48O8sT228qOd7IOK25tcW9drjhisixQBsGPpm6Mlxk+RWDh16EM1mWArXpn94k2BWbUei6EiKyrlXB6wbkkepblsob84q9zllGshdxxChmF44nJVPzCQBfAIF2B6ui0uU+ne91iwqY75/YG9uKjdYnaZBUrOQHNPL3dqQfgG6iTKnFZtAcNOUS2kdcd2FBzL1a+69DRXVZune3kZ6DGxc/JZB5k1MHxZ9m782clC1W/xF/kIX5Rw+6CPUlysKw3UVvpnSXEcgkSC5nXg8Vpaw1F/EtWKCoWRH3Ehj/SO8Z7ed/RgIWYPU6JE7lc6Z1qXCzF5GI7gKz2CTGlxZhMz/txSAdZU203RqtBTU+dD6i/Dnyng61grHBvZh8dWaI4n2FZgcggYZUGekfTIpsKQTnW0YPkAVIYGQpKg4ScILPcaU8gfBXmMyIVpAPmjlNSGW 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)(82310400026)(7416014)(36860700013)(376014)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Aug 2024 12:55:33.3070 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 412209b3-3db8-45b7-1e56-08dcc1e08b59 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: SA2PEPF000015CA.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB6071 X-Patchwork-Delegate: kuba@kernel.org Unmask the upper DSCP bits when calling ipmr_fib_lookup() so that in the future it could perform the FIB lookup according to the full DSCP value. Note that ipmr_fib_lookup() performs a FIB rule lookup (returning the relevant routing table) and that IPv4 multicast FIB rules do not support matching on TOS / DSCP. However, it is still worth unmasking the upper DSCP bits in case support for DSCP matching is ever added. Signed-off-by: Ido Schimmel Reviewed-by: Guillaume Nault --- net/ipv4/ipmr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index 6c750bd13dd8..d5295b69bc0a 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c @@ -62,6 +62,7 @@ #include #include #include +#include #include @@ -2080,7 +2081,7 @@ static struct mr_table *ipmr_rt_fib_lookup(struct net *net, struct sk_buff *skb) struct flowi4 fl4 = { .daddr = iph->daddr, .saddr = iph->saddr, - .flowi4_tos = RT_TOS(iph->tos), + .flowi4_tos = iph->tos & INET_DSCP_MASK, .flowi4_oif = (rt_is_output_route(rt) ? skb->dev->ifindex : 0), .flowi4_iif = (rt_is_output_route(rt) ? From patchwork Wed Aug 21 12:52:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 13771403 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2044.outbound.protection.outlook.com [40.107.94.44]) (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 D2F4618FDC2; Wed, 21 Aug 2024 12:55:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.94.44 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724244934; cv=fail; b=mdYGwEF169ZrxknBk22+QhAf48DzwkQjevBn9/gycMHibbuz+kcGr0MCZEHEoqEtv+eP9BJGj1bjPdWTyZsqXt4LiASUvc+w35kEFO/DRHkTHe5fJShb6ZQEiuxXPrb8hc7jizHmZ665LJpOLzFlcYGRtbbYN3IaNHqSwA2Xgr4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724244934; c=relaxed/simple; bh=JEMMVTYPjFnOW5Az7+cz6O+69+Yiw2A4p5vqSogPncA=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=IhR900Qo1zofhU7z/HzBCcugDjile2zLbR8NdiaeZBrHs5t4lbTIvWQUbAIo6ZJOW3ratSHx6YKgm87VOONAGfF2pobpluUMY6MveLpMeRGYXn4CJSqH8dc/x0bnjAdYOIJHPDpzBnyegPCW8TfsdVNKTQOyZJFZnIiKUCNhQZQ= 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=ftt7kB8w; arc=fail smtp.client-ip=40.107.94.44 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="ftt7kB8w" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=M3EYO4LwTsSQl4olXYQhhdLrMbOWdAO3Qb6tqTWti8HBtoLJev915bXoxotzdPRMi9CBBRUJCU1syeiPfZIp/dCOE71weL+cOoLzznDW6c+3CMYwvKvSE91sq5wVV8X70Vhzpz23A8ODkdKM0Kce6l0NHtCiIk8LUI0dVhcw3Fl8GIBP0MNvtDkEXX6xu/0lqfakktNfMnIbWDS/Y5An9hGP00UZZeQ1qSzbtXXBG4qKTGqBTzyNXR1jb2YdyuEzG42tuFSAmpwIu8HTsfc3LXbBEVFG1NAmkIgda07F4GkMLBIfXDGTl7RTNdi+LaT+FAF0+f9rg76skyhA5LwYeQ== 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=E8Nz1X78BcCveBblWtaHUQQtoEzRq5zSavMsXEEVARs=; b=VVvOzZT13U3/bB6Noh6Nqj4R8k7GZqB4MHiiz45T+hxiFFsVx3IQBSCIx1Jg0n1yTZE+TFGTZIFuiqJsDhvnQcLMGiUSAFkF0+yJQguoNbJ6aa7P2HFYNU75VzyV3T/Q4t4JX+FyuX53xLgKKP/1IsnFzjNPNQMhj0JhjUxbRfwee5H2TQdN56rJTHosjNktuMP+vR/BMBRQvB9ahHksiX5PKeQyyAWYtXNn9VKFaDruzHSNgQRKe4kBwfbYmKIHqLbzydPFa2PUskqU7uG3htTs8qJ5uXiwV6zLC+4tIn7yUXob7XkOAwEy0qMgNEv1HZL08/d4X4WK//9sQsErSw== 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=E8Nz1X78BcCveBblWtaHUQQtoEzRq5zSavMsXEEVARs=; b=ftt7kB8w9Aq3Ucp7lxbLnHLM9/NyfZ5rZWc0fIMqPGAcNGm4QKf0tPNbnKuU+d4hH8T6JTfaTPhrp9MuuBIz8US3N/xrqL+d1bo+OE021pA+wB/L8jmXvMReX2S7v0GFJAD40NLVcntZTWpze6raGNLRNjgFssMc/BUyE8U9aksvPl8WktyicLYdtBA3RdvrR4zjlD8FEEfl7yoemCWrZXqN8RP4hH6YGqwA20lpYjwOIGW/XjwjcGvOVfVSPzK/vtN0POPicqJsIohqzt//XzRLAjNXXlc/2XojnkbkDudJ+P4xAcB49DoPVvkbpjD6L/TTjpkXeWFmnKT851VOYw== Received: from DS7PR06CA0001.namprd06.prod.outlook.com (2603:10b6:8:2a::12) by DS7PR12MB5862.namprd12.prod.outlook.com (2603:10b6:8:79::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7875.29; Wed, 21 Aug 2024 12:55:27 +0000 Received: from DS1PEPF00017095.namprd03.prod.outlook.com (2603:10b6:8:2a:cafe::93) by DS7PR06CA0001.outlook.office365.com (2603:10b6:8:2a::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7875.21 via Frontend Transport; Wed, 21 Aug 2024 12:55: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 DS1PEPF00017095.mail.protection.outlook.com (10.167.17.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.11 via Frontend Transport; Wed, 21 Aug 2024 12:55:27 +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; Wed, 21 Aug 2024 05:55:14 -0700 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.4; Wed, 21 Aug 2024 05:55:09 -0700 From: Ido Schimmel To: CC: , , , , , , , , , , , , , , , , , Ido Schimmel Subject: [PATCH net-next 07/12] ipv4: Unmask upper DSCP bits in fib_compute_spec_dst() Date: Wed, 21 Aug 2024 15:52:46 +0300 Message-ID: <20240821125251.1571445-8-idosch@nvidia.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240821125251.1571445-1-idosch@nvidia.com> References: <20240821125251.1571445-1-idosch@nvidia.com> Precedence: bulk X-Mailing-List: bpf@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: DS1PEPF00017095:EE_|DS7PR12MB5862:EE_ X-MS-Office365-Filtering-Correlation-Id: befa76cc-c610-4e47-e082-08dcc1e087c4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|7416014|36860700013|376014|82310400026; X-Microsoft-Antispam-Message-Info: nMLyiV7EtutNotwwJi58JzlbTCewgiCGJo+VmubAwAnjoQ/UFJexlPfSvF3vsyeyAscDBOu48MHBQEDMzvYBSr84FzMBSXevBaLY7+UyLD+wQovrO8bL5E6mmhHfD/0EIXTE/vNJPXGwxaGIgFEwfJHdt9pt12cEJU0G15yGz7uBWj2gyio+5DYVfTPG5A0zoBHHN40omzE4YNv+XMO+YN/9kPwGZQqmkSH82NdVyOPIYoKAZg2l60/Lb6jpK/KUTzesC7SDiPrqrka9LKIef3Tob+nE8+z9ZXeFBKKc3e++kjsBmePvkmmxe5GumcCMhPJV9pLlyboyik5EYWAjrGUkzzNSdtr9KOZIw8fJFRDizfvZER2YHKigL2hW/iHVDc4rC4AjsBskUgATD2l0fnQjSa/XEpr5/mgjMjW7LYaz3nXCPNsVF0LQcFp4Apy+TL1V3auBdKhUVu2bO4dk0Vcyxes3KEK/0Z7ObNCxYtyFMVZ7reYWqipUymTlrJHa7Mj70h2B4wd0J3YgqkowTZfQuovQY7cY8oJcVcMnGsGwyRv1hWC46PjiS5j4ZgA9e6nLFKcSdZyIqsQg+RjKOnvd1EAOvdbQZ0UvzCI6suDuAOKkKAA6qJSqCGH5MGtFVqVut6udalY3XasU2Om1mGhFVJNyasNFyNwx6EkBdy9h+e7+THVriWR3JS1pk6S21sTtPfNZ2Tj2jltBotapAquQRmy8sOsHK2hAvJZIRYHkOolzbujhdbs/ZO3aq4syWkjOmzFp1zFt0hiuZz4ewjOYlRfid+HmSD4f4JP3v/OUEF3VkIho25DMKdvhX9AtaZ7e2d6/Pn9fx2lxrOYJdFNCGbaqRGhRsOt7K006gqHNumC/GqovKN/2p3tfDB1BLxlJHbF4lA5caDrUY7yZ59emRnJye1MAVYV+6B7w8v+kNXO3fs3xHIKslh+Xd28JNZnrQS7eBzEqylGJuzLE6RTypCWlnd/kVXAklfzIenzWUm+WgXjMWxO0KwB1d7BWTjzWY3fM0cudoTomDzvPUVdp/uSwWe5JOwVh69i49koU7plGjtCBRZld5LKLilEClokDFREhDcTuLt4faQC/8C+IKbRfmD5zVLGj9N5dEgmc0kkxTNOxa5vNtSzA4TPtljGfhl/iykk+C4EZFKOXEKCvQMz4DVevMRRnBJzaAtcFLHdWgrAxyXQU4rMXBfLe+4wzxIZxwwBJlNlS0LHCe9rPUNozN/a6iTTznhWkBop/djFURDkDpItVZyCz66nwwcLFF5qmPDXuwd+RaJcA0yUPd/dHZ7M/+mKRkMLcQcvN4AyzNOGyq/bjshofUxNC6gJLqJRDgV66DuM8qwPAn6fxWZT0XGL4np664KXFqypjy/aSOyo9d3q14yYMMAIgl5doQXGGr3E1nm9tzxX2qYpvZ/uoF6jq5ZS4o38KtEXhtdAt+mdJB8YZJ1kEibpp 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)(1800799024)(7416014)(36860700013)(376014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Aug 2024 12:55:27.3179 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: befa76cc-c610-4e47-e082-08dcc1e087c4 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: DS1PEPF00017095.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB5862 X-Patchwork-Delegate: kuba@kernel.org As explained in commit 35ebf65e851c ("ipv4: Create and use fib_compute_spec_dst() helper."), the function is used - for example - to determine the source address for an ICMP reply. If we are responding to a multicast or broadcast packet, the source address is set to the source address that we would use if we were to send a packet to the unicast source of the original packet. This address is determined by performing a FIB lookup and using the preferred source address of the resulting route. Unmask the upper DSCP bits of the DS field of the packet that triggered the reply so that in the future the FIB lookup could be performed according to the full DSCP value. No functional changes intended since the upper DSCP bits are masked when comparing against the TOS selectors in FIB rules and routes. Signed-off-by: Ido Schimmel Reviewed-by: Guillaume Nault --- net/ipv4/fib_frontend.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c index 8b740f575da1..793e6781399a 100644 --- a/net/ipv4/fib_frontend.c +++ b/net/ipv4/fib_frontend.c @@ -293,7 +293,7 @@ __be32 fib_compute_spec_dst(struct sk_buff *skb) .flowi4_iif = LOOPBACK_IFINDEX, .flowi4_l3mdev = l3mdev_master_ifindex_rcu(dev), .daddr = ip_hdr(skb)->saddr, - .flowi4_tos = ip_hdr(skb)->tos & IPTOS_RT_MASK, + .flowi4_tos = ip_hdr(skb)->tos & INET_DSCP_MASK, .flowi4_scope = scope, .flowi4_mark = vmark ? skb->mark : 0, }; From patchwork Wed Aug 21 12:52:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 13771404 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2047.outbound.protection.outlook.com [40.107.94.47]) (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 E34A518FDC2; Wed, 21 Aug 2024 12:55:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.94.47 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724244937; cv=fail; b=GyVa3TWXxmjpURX+84vswLQekzFzLiydoQr6Jm6ALUmUmEGDmOgQ4TVQv6Sn0JGK5NRmxvsmrfahHD/Wq7Yc2J5dS+pt25or6Cm7ocK5hLWRbhIU+9zCNSwZZESiIEybRHk7kw4gG5p+uKWi/t5W6NHjBpwvaDgjfMy0Te7DHiI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724244937; c=relaxed/simple; bh=T6O7aCm90pi1FYbLLV2LBzq7iQVesA+s7k8pabiPcig=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=HFTAX3tFA2WI3VD8PPfLh1AYe+H6t9Xgj+DRa1vM35tMNdz9DID4kZfYsoOCOS3LMUpnwHUyDzNJb/1LxeaD13B9MVGTDOds5XYgrCntt88LzYdhCpemKGPCOJh+6VjSIhqAwYTPRdlsJ1hvi8BgF6T2tuoPBuX3nl03ShktpJE= 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=di0avLCH; arc=fail smtp.client-ip=40.107.94.47 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="di0avLCH" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=YT3PT/lWCA/4z50oE2cWueXUHDpitC04jf40NhLvqTHR7kF8vUjGH7B66VenFvt4Inl6GrNRMMxwUhL1brrSvSpE+fP4KNSIxUQ5QqXczQ/AjVqP9X+LjXicT1ffdKZvZk2ht7qPaZu32MLAYjUg7Eo9dfk3Suorg5Lmq3YODv7BPMAVbTO/FJB0TS5XkP4Z2Vdm0QWe7zzbAB2TswVY57LT/ZYF4ivYL55bTLkLEllNKStZ+hagR8m3vRuxmE8fFHDA1tAeABakQqw/99clyDdisUPZ5l90YWbVpkOuvNUWJqbplYYSlMaReOFyuVXogVsX5YEjU3B1VVzISmN+1g== 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=uUc8X2ob/ON1IukCpo5IGLuSCvTVSrkK8Kcg9APnjOc=; b=GMeSkoNM6r/FAHr7PGmHWO0oLwc3TmmwZhpMrkMYuoCkkzK3ZOYBNk8apD+4vsY59IZ84584EtDponlQ3gecJg5QkochB/qVaQDXDR80OUpTGk/GGbaQU2Roxfzn7+phka190vqMbJdKgvKihkZMl/LF6hdKgnAmA2aCtT2RqDazz900KcRh0eFgalsy2clW5ezgcQ1S0ZpFAzT3dJYgOOuzTWJlTy3pligfUcl3RAJ4q3Fqt1/GGTf8A2mrbVQcWQsW0QhO5o7nrUO6HGJ4RVbtnq+NmLf7d1YeI02aJT8Fk7xYIbfbtZp4yRZTBc6IaSJD815Nhrye/BcNZ8bEaA== 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=uUc8X2ob/ON1IukCpo5IGLuSCvTVSrkK8Kcg9APnjOc=; b=di0avLCHehcujV1hfqB5bGAavFwUio8TuO/zm26aUMV319G7pOI7HAm+YxOxWHq+YLq8FLw1WqwWhXkjxiuAUWjAgT5o4z8PgH9409YXVQEc515oJ8fRRwdyhg9KF2N7r+arSLr8AGlV+F12OB6HRWx2/6LWEJwJGfP/4VHtOulG2uuOsmb9W/npVgFoQ3HcLmEjp+8pDq3CPwBl0CxUQ0kxGFDWYUg4HReByrVwq72Po6ox2bjUqyZGeiPeICNVZtDmNNgHG6aMr+ZshsvOgsmdg+naF+z/0pZZyDHufYSFiMf9Lboz1PS0pgubG6cEhwxBZ6+YuTuJi248J82m7w== Received: from DS7PR05CA0080.namprd05.prod.outlook.com (2603:10b6:8:57::18) by SN7PR12MB7810.namprd12.prod.outlook.com (2603:10b6:806:34c::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7875.21; Wed, 21 Aug 2024 12:55:33 +0000 Received: from DS1PEPF00017090.namprd03.prod.outlook.com (2603:10b6:8:57:cafe::d3) by DS7PR05CA0080.outlook.office365.com (2603:10b6:8:57::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.13 via Frontend Transport; Wed, 21 Aug 2024 12:55:33 +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 DS1PEPF00017090.mail.protection.outlook.com (10.167.17.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.11 via Frontend Transport; Wed, 21 Aug 2024 12:55:32 +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; Wed, 21 Aug 2024 05:55:19 -0700 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.4; Wed, 21 Aug 2024 05:55:14 -0700 From: Ido Schimmel To: CC: , , , , , , , , , , , , , , , , , Ido Schimmel Subject: [PATCH net-next 08/12] ipv4: Unmask upper DSCP bits in input route lookup Date: Wed, 21 Aug 2024 15:52:47 +0300 Message-ID: <20240821125251.1571445-9-idosch@nvidia.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240821125251.1571445-1-idosch@nvidia.com> References: <20240821125251.1571445-1-idosch@nvidia.com> Precedence: bulk X-Mailing-List: bpf@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: DS1PEPF00017090:EE_|SN7PR12MB7810:EE_ X-MS-Office365-Filtering-Correlation-Id: 2dc4d80c-54f1-46d7-1117-08dcc1e08b2c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|36860700013|82310400026|1800799024|7416014; X-Microsoft-Antispam-Message-Info: 0UYe0/GIK5JlsrfpUQRmAHDMKRVeCnGXDzqxE58QRlE7qrlQJbQd5Mis7fw3Bn9pc9B3R7jpJCYydEruG9fJA365AR6Nn6YgiNnwdZzzNUa0zHfCiq3S8eAQNQuL1ftsTg3Kl3woPDg2ofhMlHS6/RwIrEG8Khaem+Mp/hx20puCoKvBjcoZyYtB6zKxPI3ctkByQWAMhioi6Jd7azo/agEGYa4n35LWwlVBOLcBkEP8GrmoAGxTWGDAickX10Bwz64f/tOetE416htMCh5ZA9nDxUlZ1WMBYN5Ro4G2pzABtKr8tYIJHv6XIcl25col71pT7RvNamA+BXV7cIYAKBB/diamNIVUeUK3mJJEKv+cPllPkCcGU9Zf3qoxvE7mXfMKm+wHR2yIfxD8A3UqhU9zLneDX01uCTzBOx1LziYLQ95v66/HpTnwfjAzAAweZcDXHIVtFBua6qrdmUyoXoXs2ceFC0lp+jbgcDAu7Jm1m7SpplwWtXocDJQRz3coOs/p5rHbIRykSO12F9NiZ03Qi4q/j3GHGjykmgkE9OMcaiwmoirKgv8O+M+hddDrZRfFf9WTP5MHFkN0PBXheSR/1UQD6Gyp3n5VG9HBPaKuwDeh8qup8mQxTMeDJPJUk6JlKb1oCRnuqm1gWi5Beud5rwqkuBsMCbGLsTk6SseJR4ulxCFuSA8vz49fyeCxNjRAKsGxwdgd8QtkokjB6uTK1FwamcYeXQ0oC68zue8UxaUIMBZGWe6e6Ap7RGGMwORt745Z9pO4iPO9xyQS/SQr398/Ph3sFZDbvHiK7oXGlqx3kCdihJsKyFSoc8cOI2aWZm9w/k/M/GDAQSHFx3XrNDKV6k4OJYgjE+wXjuB7Z56jAI6wc/1Df9sGkuTubYwVpwmiePxuN7QmNAUojdxK7GZRE0trJkUpsCY2C11usXBhV1laouzm5WrB1GC97sNQGmbOpPZx4h+TQ6P9KqoPpmGdLofKFwZhLwdfmWrwZevf+/v1APGMgsTAATmHXxApsZG59zNVBNxKba9GpWrrUQ9qBYLxGIRA645D865mQWKZtOi78+LmKedwssau/5ppvGiR/lhqZvAnsfJH9a26conaoB409E9yNkOHKtTYQD13ADE93Cv9PK5TTPKjJi2mpWa8rKA8pnaV52f4VM2Hy3MZYOWAr7vqrflwz2cEmB1y8w6XVeg0nu7NmTY9h40PIgMBUYjojujN1n+cQLyqC5v5FbGDTDc7g9h8cL7abXzwVM0HkShgsrm2Ux7mhRsuVHd8u48I4rQPuhnWIj8S+okD2Pjlmy907F1l4RgWzunQcP6AJHJM2iyKm/ljhmBDxZpWZDOkAn1QwFx/a/Vl7WEsh6pbAz3UZDEeHGCVz/3a7xY4UI5oEF35OgnzmcINWR0O7cATpQd2pw1CYMWN7JmFqhwJGTzLZo/bWq3f3ZATXG5BTVgf/rAwAC0s 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)(36860700013)(82310400026)(1800799024)(7416014);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Aug 2024 12:55:32.9961 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2dc4d80c-54f1-46d7-1117-08dcc1e08b2c 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: DS1PEPF00017090.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7810 X-Patchwork-Delegate: kuba@kernel.org Unmask the upper DSCP bits in input route lookup so that in the future the lookup could be performed according to the full DSCP value. No functional changes intended since the upper DSCP bits are masked when comparing against the TOS selectors in FIB rules and routes. Signed-off-by: Ido Schimmel Reviewed-by: Guillaume Nault --- net/ipv4/route.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 9b6528b7b562..73bb61162445 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -2470,7 +2470,7 @@ int ip_route_input_noref(struct sk_buff *skb, __be32 daddr, __be32 saddr, struct fib_result res; int err; - tos &= IPTOS_RT_MASK; + tos &= INET_DSCP_MASK; rcu_read_lock(); err = ip_route_input_rcu(skb, daddr, saddr, tos, dev, &res); rcu_read_unlock(); From patchwork Wed Aug 21 12:52:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 13771407 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2044.outbound.protection.outlook.com [40.107.236.44]) (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 E0EF1199929; Wed, 21 Aug 2024 12:55:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.236.44 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724244949; cv=fail; b=qy6+j2MaQ6pFVJtbsUyotwJNAxy9md9YtTeP5DImieoxn8cyZ5w9LJgSEoIqYx1YCt7+nqtr052PE0ZsgTobk0tnGtq/qef3jpURMIwPIAqROgLxMeIl+DDY4xuTrnsgxr1E+Kk2OlcmIGP+VLFCqVMD4u5ST4+u5FPmkLKqWXM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724244949; c=relaxed/simple; bh=JdJAOZdeIb/EnwB5kzgnKm/t7RTZtRp2XFvC+2JBaKo=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=U8djL2gOVtVU/S/mzP7d0mtPJIpyvNjvfbdM5dlUbp+EHzX0NZ60o7YrY5QQ98lYdj5FAtsDmStPndfVucJlwC+aHeGqpuMJ1f/7ms1BPWseOm1u4TxHbaqSskO1pbVzCOHJzQMsGjo1wIETeH1fJJacRBXy8kYaxCfz7rlQ3Us= 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=dv9o1KUX; arc=fail smtp.client-ip=40.107.236.44 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="dv9o1KUX" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=CypxgEMqx5SoXqI+TCZlmXnNMRc4771Wi4Uzh5fC/g+zLuF3X4yr24ic3NxwAsIOFQyQ/4I+pp9nE3ogZfQYa8Ymnc2S9C6ZGh8oDZug6nRG0RQRD5QMoUUvrrljMsvRk5BQ9LBPAkCcS729th7jL0+YnnqQpPk2nV8tL4t4OPPL89KslsBAZUVMtYwN7u4lWI/yy6svtuVqKet+kjj0WAVBBbsCMSxU0ENB4AlQvY6qxO2tuQSvM/j4qslYHRH1zn5CTmrTaWE0N7foKIKQBx2X6jxqjO6kcpKrdbx1Pe7VLg51y9foFI9qstYeKWCXfBtSTaxt9/RPdrMk311Guw== 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=QNn9TVtOHYLkQJp+j/8k31F5Cd91zfWdA9w+5U7JoQg=; b=krL6u0f/mo7OMOhMJw0CzQufbtUGKbxpmGYBQHczl8V+rCoPzD3WmO1fiPwsfSsxr557bai2qnhcO4qybaHcNqNo/zoBOxZ7ybKofqMK8bgnmg65AFEipyVz4OtpTwEu7I2qybfVt5yGMPhOWD0SU0P5daEY5gJcOfIQJse7u7krPpoKzXR+Ferqud+1opbFkzWMGt6/3SAXFXshMH/BazfeHwG0V417PrUhFU7CSpHBBf8hncqF7Ia1oRakoXgWN1yyZRCmpw4vR9+b8wBHMmfylWWR2vtgf95YMN3pMmjbSNG2Gd/vHtf6YItWeezmxE13VM8CYwoTmtnaEJJu5A== 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=QNn9TVtOHYLkQJp+j/8k31F5Cd91zfWdA9w+5U7JoQg=; b=dv9o1KUXzAjUi+tpCrhzD4EBK5rIesLGYTKrkef+eyEWYOsZYfqooThhXkcN4OSWkxM2jtWn2XUFtHT+lwAKqbLrXQ1ItYDShrybwgYCao0ZmNyQr09LSxCXWdp2Gc+sgBS01w4jSzqWtgHgx7BJFnxn4PiNSY/EoJqVCkkPPLbc3CByv5zaWBgW19HlH5dEXC424E0dPbgXelIz3qzyJghpclwRkm+VoVNU1D/4HmCJCR0+bRT/HJraIEtGd7GCM1aSwZqMQilySnZb8AOupJjfaMiDJlREG8Lfv4nl7AXFk7WPgVAQy2XdnpWhM/PbNVyfgKSWtw4oZRJKedm78w== Received: from SA9PR13CA0026.namprd13.prod.outlook.com (2603:10b6:806:21::31) by MN2PR12MB4256.namprd12.prod.outlook.com (2603:10b6:208:1d2::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7875.21; Wed, 21 Aug 2024 12:55:42 +0000 Received: from SA2PEPF000015C6.namprd03.prod.outlook.com (2603:10b6:806:21:cafe::75) by SA9PR13CA0026.outlook.office365.com (2603:10b6:806:21::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.13 via Frontend Transport; Wed, 21 Aug 2024 12:55:42 +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 SA2PEPF000015C6.mail.protection.outlook.com (10.167.241.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.11 via Frontend Transport; Wed, 21 Aug 2024 12:55:42 +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; Wed, 21 Aug 2024 05:55:25 -0700 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.4; Wed, 21 Aug 2024 05:55:20 -0700 From: Ido Schimmel To: CC: , , , , , , , , , , , , , , , , , Ido Schimmel Subject: [PATCH net-next 09/12] ipv4: Unmask upper DSCP bits in RTM_GETROUTE input route lookup Date: Wed, 21 Aug 2024 15:52:48 +0300 Message-ID: <20240821125251.1571445-10-idosch@nvidia.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240821125251.1571445-1-idosch@nvidia.com> References: <20240821125251.1571445-1-idosch@nvidia.com> Precedence: bulk X-Mailing-List: bpf@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: SA2PEPF000015C6:EE_|MN2PR12MB4256:EE_ X-MS-Office365-Filtering-Correlation-Id: 54155890-baa4-46e5-4294-08dcc1e090cd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|7416014|36860700013|82310400026; X-Microsoft-Antispam-Message-Info: EAVYrgi5PJjM5Pq34qPGs10tu+SzGk/FHvVfIPxTZSrI298XPIaFF8YfpSKVcKkavf7nQxZaH8d0Zd14ybd6/ACn6Zh/U02BPO8mFpiWQUrmFOfhOFDIgz9JUdb4F1WUGo9hfRlNKusoG9oUrVNFdvml+SH6vnQunbA5EsRCEhEBrNG30FVxRQqZqfh3d6MSmimKbxLDrBy9dTUXJxYTjM8FhIHFofTZv3UtDND0gxvhgMPayguOwkxN1Hp1GeqnjUygnBeB5a7mMflHjhUlVxrjwJEw8Xa3KNOEIcOTuKdNJwQCiJbUJkhkse5cnG83Q6CRZSjz2QePAgon3anjji+ayF3FXAXtKLYoSST77+gKrOWEayvQZkomVd1jAFamfTSU8XdlKRvFe2iHVfuTRWEa+hex2uzGw4rTUBgFFlg6zs/B+3jsprIq7gUVwUtv5ivWSvxCF+J2MkkqOYgQNLIhlEtb7I3DvwMsd2QDczZxZy5BFVb/DkkUXIMgvvz7W3sWS3mZ0/OWQBpH70M0cwWfNf60YL7GPpOcuQonNTVRZTYxOnPqin3e/Rz+PEm5VUE34k87JTgOohCPVAhOlX51a6P8suqPdfP2zRLRpGmgjJHDY4pygVOCP6ZMt7nFR01C7GLEme4Ki86Nkf30C5gQif5Ar6BnrytDKokBDYMISydr1o1NQqXhaTmu4H6mjrZHujk8+IBE8GkdH8Sy8ElTzqw2/duHxo0T6UsOV2JG6MHaxZYxOp1CfWmnl2p5Zqri1ynpNGMF45xzga/Axp3AKZuuGbAoEMBMGUxqT/9hq89sPlWoXrSJDK8Wdje9ttdtBJ1qJ7Dq7y/ylopIvjLyB3nNkXjw2fZAmmGyg1L2hBxIbZu5tlXnF1osc3AZYQ6vcah1AwjiTct3NsDODKf9vqwR5/oeV2rEcxBfIyKVDiH7iP6V+amlwugXXunpu6I97kwUsF2WjC0ONaibE+le7bazUdJEPSbtykUPmSnzmtLsgX7k+U6GEZg6LL9awjkog/YBF69HRqz0le7cyMgQdiuDmxMF63MzhObs5FZUDwNSPYnhqwycsP5xcOyG7ChTuDviX13gJVbSmvEIDXVrE3kcffHGyzmup7YAdjH66VfKFUH+vCWVjf4wgtNthiew9xJtwr7y9QfC+kFzVTbX3B2x9VZQA0cZgnZaKaEuOg3Tu/i8hRiMwmULn5sDrrUNJTU8SLdttvBibnu65qqzSccOBlW3n8V6Fg/VsrhA3tZZM5EaWyw+s+EFcsY2STHWpuveBInIgy0XgPOFcXYGeZYXYePEQMyJEZkaafOBBFjr6dGLjFabRnrnozoS5qCR2y4pvP1gv1G8iaaBjMFnNmmXIgYP7OwYzk5pzd3r9k1oUvLMu2vZbNBb6zQglEEGSIhMn8YgsGCCks9WJmCyKJSNLYdildiQjs65INmdU61ZCbz90mrbXcoR+uCQ 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)(7416014)(36860700013)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Aug 2024 12:55:42.4567 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 54155890-baa4-46e5-4294-08dcc1e090cd 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: SA2PEPF000015C6.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4256 X-Patchwork-Delegate: kuba@kernel.org Unmask the upper DSCP bits when looking up an input route via the RTM_GETROUTE netlink message so that in the future the lookup could be performed according to the full DSCP value. No functional changes intended since the upper DSCP bits are masked when comparing against the TOS selectors in FIB rules and routes. Signed-off-by: Ido Schimmel Reviewed-by: Guillaume Nault --- net/ipv4/route.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 73bb61162445..524b70ab77a0 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -3286,7 +3286,7 @@ static int inet_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh, skb->dev = dev; skb->mark = mark; err = ip_route_input_rcu(skb, dst, src, - rtm->rtm_tos & IPTOS_RT_MASK, dev, + rtm->rtm_tos & INET_DSCP_MASK, dev, &res); rt = skb_rtable(skb); From patchwork Wed Aug 21 12:52:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 13771406 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2044.outbound.protection.outlook.com [40.107.102.44]) (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 BE5CD192D9F; Wed, 21 Aug 2024 12:55:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.102.44 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724244947; cv=fail; b=GGWW6TncPzUJU74+fdj28nOMPcEY5z+Pm1PpdBrN9V71BUoFxm+7bUzvwMJ6zE5umHcwJvh4v+dUy4PwJroS3Yhi6HDUt/c8HS5pvUUgZ6gKpt4hEP8RRKBiJKgYHMCNd/qMuutfHC0WPCl7Dc/+u3tFcQZxKRW33yK1HkZbXMI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724244947; c=relaxed/simple; bh=LUHUn0mvZj76TcpiV8zMWiz2REV0sO2dCJL3jfm8BIY=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=TcFChm8i3+CmQ/DChMQTz0OPdVw/abugG6oBYQa98IOBduA1gElNk536L7IBboniLjBqLOJ0aNBy/bxsQ1bkZBAb48D2nWbFeZoFOKQbt0QxRIds/P/y3uV5MHK9ORAk5X6z1O/kmagLm7Lnd4daX9OWEVIecd0DVqgEc6LpKTc= 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=I344A/6C; arc=fail smtp.client-ip=40.107.102.44 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="I344A/6C" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=TdYtxkoAJWW8xJN4PyScrMiPL3Otsp0V3z5eElJJ6WqGa0mUl34kAIxVyKFjR5QV4haNB1wBaJY7tDax+bJXSkbmwYZ5SbHZQ61fJpVc9yP77HAT8zBenW7ZX5Q8ysSkk2CxfvxNEtfcsBXBjMumBDJ6SPaY9FGGfS7FWGVgahR5p7y6Zo2j8F+0oR37X9obCZq39lxEJtCqKshrvoPLGYlsgwSSbuEJiNW6TWWCMAaSRgB3SZsfQFK7s46nGdVhA17LZVYra81CB4KPatEMH3tqFooUB89EQ0pJasOnPqdQxorEUIDM6X7lbXsS9YM7GamPO3pRIZwBcbOuMi+a0g== 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=UfsxFmnYnhI1bxW4DZrU6kUwJaT1fP31nwBBFv5tni0=; b=OU0dxan4rOyOuyCmJ2wYqggEc3Se8XwsN3vxrkBr/aXJ7A+uBzF7Ls1uv/3Q/Z1/GJz5O3/SR3ykNS/vrpnHMNO1JlwFnuk1uBVW9OiITOxr/Y6UUPmIShh9GesZQd1ZLovszB9XdDBnBwrvCqVs4oh/NIBB2W0ORE7zO1Ly0+O7hFQaelvyo8BKgLpLeuS8h5vw5KXf+datAEk943P9Rn7+hBIvD0i9dM1g9XYHLEPJxz/ZUd5nzZzw21URqr0+NPQ/WAJ4bL/GS3twDlIECFIGvopDiNUv40o+LNioo4CHBe5iZhGpFxWCCp/ipsWpzFg9QknrKWpOFyJWQn7yQA== 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=UfsxFmnYnhI1bxW4DZrU6kUwJaT1fP31nwBBFv5tni0=; b=I344A/6CVHmVQzeb1+g01Xi9IonPcJcwRaTgnKZB9iIQDF086peyJasZn4rumkW02IPROZCEiSVITajPwjd3x5Q473BZdDAWFzaqd7ggRwZJx0IGgjPJE5V2bMLSRwD2burReg580k7OA0dodWRfPoQEZ+dRS5pEGq/AD/5M23u9Mh0g+0cDl3k5VqzcI6lamqWVEdf4oyzBpoGFv1W8U0p17a5AbAkZ6FEK6vMMY78hQR1+Ie0Uft0kL/HshtRb2wLT1b13u3yqGdF3dGyRa82AJIF/1tqatejUHBFdkH6U3Y8nHh4CDthCHMpgQXqUloXTxSxsUm4eW+ClP/pdOw== Received: from DS7PR03CA0043.namprd03.prod.outlook.com (2603:10b6:5:3b5::18) by PH7PR12MB6634.namprd12.prod.outlook.com (2603:10b6:510:211::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7875.21; Wed, 21 Aug 2024 12:55:41 +0000 Received: from DS1PEPF00017093.namprd03.prod.outlook.com (2603:10b6:5:3b5:cafe::bb) by DS7PR03CA0043.outlook.office365.com (2603:10b6:5:3b5::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7875.21 via Frontend Transport; Wed, 21 Aug 2024 12:55:41 +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 DS1PEPF00017093.mail.protection.outlook.com (10.167.17.136) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.11 via Frontend Transport; Wed, 21 Aug 2024 12:55:41 +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; Wed, 21 Aug 2024 05:55:30 -0700 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.4; Wed, 21 Aug 2024 05:55:25 -0700 From: Ido Schimmel To: CC: , , , , , , , , , , , , , , , , , Ido Schimmel Subject: [PATCH net-next 10/12] ipv4: icmp: Pass full DS field to ip_route_input() Date: Wed, 21 Aug 2024 15:52:49 +0300 Message-ID: <20240821125251.1571445-11-idosch@nvidia.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240821125251.1571445-1-idosch@nvidia.com> References: <20240821125251.1571445-1-idosch@nvidia.com> Precedence: bulk X-Mailing-List: bpf@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: DS1PEPF00017093:EE_|PH7PR12MB6634:EE_ X-MS-Office365-Filtering-Correlation-Id: 9adf0bb5-392d-46fd-0c37-08dcc1e09032 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|376014|7416014|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: cKsB2oKgg222Dmd6/CojTgvAe1ZcRomHU5Xpv1auQoy0YP+Ugvh3Lz5LOjBwj79+Weexh/jwSRzMs3OZeoAsqvzx2b0IuLJbhtZduC5SlKNZRpul0sDOY4XwhXs84YF/qsSwP61gMJpzK1uI3HBi4nadccjjpzdPCGLwl7yMZGsGKsKyzd2KKFfJMWvYZ7Mm5xKK6H+uW7WbzzQ3WG5VR94w5IP4xMRoXiuQC6VMly73SPLX1VmdNokAo8y+yoVqIF0uKFkmTVuDUDOGyprXdCY4jl+2eiXhzSqg2QmjIAXjLPbDxJGC34EaMqnEH7xbpQmGbry4FdqQUUZbMRKGR+5+GFc5+qBYpzppzglHKEvVlgq16kWZsMBur2TLSeV1mduEQM1iTxkDxRFEsRPCzbHh99x1sTxv8cbi7c0ZNAev0QOWFI7O4FJGuRMBNKoABBZXBlmwGN0AOi1M5fDxkV0kBFLUjcjJiMMbexlt8MGkyUNExkMgSmW4p5lMVBE7ddD9dkEL7R02czF+JLePynmbcNHMjUoLAEls23vLoFEdAdy6gF+6TBOL5YYj7in62l9nW6pmHZ3pXC/SDSAUV08nW9LNV6q6bymFVCIM+NQdmSk/XDmxN+Qk89Ojck9L4FXZ5ffBkM/ZfbaYTqeZFY/KaSw+u7QV/gHDM71QPXMOlh0UErmDIJ79WP+UTCt8+Ybj7zd/fomDHHE4OKeqCstR8M82sIrqNU0tNisRlqe9Ksik6ES1QpQyt3Bg/iHiJLwXcNnBm8Cq04rMt69e9gGAMfEzJNDr+4vqI6/e2LhdF7e2eyYcXouPtbxo9qjOV3NcqsQ5yM1yTbxYtFbupxPdBP3mxMEpKccxOd6RPmxQpF6ic6Hqt+8ycOm/0XTH6c75W6CmxrrL/8ZhwgOkC7MKjlogpks8GIcB0JNUTDuedSy29YwMwS814i9y64f3uBwwlgUuIcFQjNOGhCShwd5PEs0dyuNTx/G+B9MIpe6PF1XbVKn8OkqhaEdMzndLsr7ml2z/Yxe8fw1FcQDEwcVoBnBxiofKaC8tnuOR45MkOPb18n5qlvJS0Mt2FC3ryZYYTcbxVXmHDeFuRwb0NRgrdxuB/ghCBhmNYGJyF9QNePVPZl4HFy5OpS9GBhUrTdyFK/bmVlsU9eE7coYH52qxg3btBCRxcc76ds0ZJMmGzYpUMRYrEvm0RZoj4Gw+/IlR4NFttxRkZArKfptIyVkDY0wsXue4ZFhLvvnlUIqqLIekGE7h9xofiEFiyuX9FiJ8w7Slp2/Sg61mhVFfXb6+lcBIQvUNi/NH0CKfb/QXAp3E1LkQFjdIUJL4/AFZr1hb+MEuMsoGbP2+Ct5lQacGEe+fifCvCsuIeNJBrJDOmT4SNpNcw1Cfw+V39SFG0zYOG/P6LLALqUujM5JHMT7HI+lEAaxf016pB315+6Y= 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)(82310400026)(376014)(7416014)(36860700013)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Aug 2024 12:55:41.4239 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9adf0bb5-392d-46fd-0c37-08dcc1e09032 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: DS1PEPF00017093.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB6634 X-Patchwork-Delegate: kuba@kernel.org Align the ICMP code to other callers of ip_route_input() and pass the full DS field. In the future this will allow us to perform a route lookup according to the full DSCP value. No functional changes intended since the upper DSCP bits are masked when comparing against the TOS selectors in FIB rules and routes. Signed-off-by: Ido Schimmel Reviewed-by: Guillaume Nault --- net/ipv4/icmp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c index ab6d0d98dbc3..b8f56d03fcbb 100644 --- a/net/ipv4/icmp.c +++ b/net/ipv4/icmp.c @@ -545,7 +545,7 @@ static struct rtable *icmp_route_lookup(struct net *net, orefdst = skb_in->_skb_refdst; /* save old refdst */ skb_dst_set(skb_in, NULL); err = ip_route_input(skb_in, fl4_dec.daddr, fl4_dec.saddr, - RT_TOS(tos), rt2->dst.dev); + tos, rt2->dst.dev); dst_release(&rt2->dst); rt2 = skb_rtable(skb_in); From patchwork Wed Aug 21 12:52:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 13771408 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2081.outbound.protection.outlook.com [40.107.94.81]) (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 32F851A4AB0; Wed, 21 Aug 2024 12:55:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.94.81 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724244951; cv=fail; b=Tk4mBni0V7qRm1Yuzjhjj+F7DXfO77wnUEZa1FskLmNAfrxbz5viUlcNEL+VHEYshfVxBzc57Tae1zt8+Zgow6AB8CYfmgKAcLN0H3JFxpzdi1Ij+qtpJp31U+NzrI4CYoxFqZOD4bpN0b+AsDBA8L+tphN1GrI+qsLt+roMoBc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724244951; c=relaxed/simple; bh=KHf5+23Q1o8Z/tz2yhacSTmTS8F8a0rISZKnuL1Vc40=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=YFJrCu/hz6awkQoIDmhlQXE+XR5noSyGlnBlqSywryxx3zsPrmgdFKg1ohJyT8noS6mz3z8ZWA5+eomWXergMyJgsdXrMg26bBCdJo0Y4DS8YqRw49rCHDlzzQzZXYIrKD/xXO+1NPoE5Pw8JRWc2UrxR5+9eyBcjodtnNpuVEc= 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=fktt/6jL; arc=fail smtp.client-ip=40.107.94.81 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="fktt/6jL" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=lxvXC2ryVEyVp+21GIp7sjhfj8Qd2DKusg1CLFuoexnXKwMXImn8w8quR0lPobQ2vily1iDTl2WyYkFmKJf5HS+CWBXQlFyGfHSryAoyicq821kD7EpHaG7v/Ur1yxhJApsjeEjUvAXDHPKtumJwg7eTZtWdeNoEMFFFc9nwfsJRUpMKfN+Bz87BHy27qO4arjHWfrb4fYZ3M3ur0PsAXHjcOogU253Tv38kzM9IvyU7f722z9kGGYXGp8QGTIpgX9FloyDGjjaXsMyfYQF9HJeEhQ/Pq/pupdWCoan8gwgrDvSssO5zdhGMPafnc42H0gZ+vIuujB3htmkaMzFWTQ== 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=LvuohySGIZubXFsfVqYf1uOTo09t04eVhgB778+MlIs=; b=lK7E5hl/4g5SAxr2p0TZEgFxJwng2jGZKCRNIZzhtTjQBL/DV67f1NWbgj7YuRBej9Qj+Io3CQHuiegOTvXcNkJNwGdxMxz35ePo3g122kSPxtpNk6xcvyW2xa8pbGA6qQmXIpoLUUN/dKhapgfQWxyQuA+4j7nDTik0oiW13MBCsIRKEmiPlaZNKfRrnQEug5KsoVYgZnoFW6/+TXlrpLoM2upfOZ2/jA10N9eXesWVQ8BAYu31rhjNY4YKnKKhBn3xZDAbzReEK+bWXgGAk0DMyy0j4R1AByTyukLeKCAtMxuaTHjgOYRozpR7/XN1uQD2NNcmRBZa4RJYuhGp2Q== 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=LvuohySGIZubXFsfVqYf1uOTo09t04eVhgB778+MlIs=; b=fktt/6jLlHzdZUv73vrBqYSnZwip0wB8cCRAafZ0YgPfqhIdWz7UQsUD1JXMj++woRmnn+Of9n+SE5inHpeqzRCDq4YetpwZr3Y47ERy3tggn8IJhpv5oURKT6n5inZ8HcEYtU43EviqtDSEu17UgWTpDKhti35Yl9ZC/pIpb0Ngqw4IK4gjOBvZcEKkQxUafTpZUfMdZ/amnoXu3AFdoCfgkOkOvrOY9+vsRBcd5mP8wqPbHo8T903ZdAH5Yhq5qsMmFL0f3i6JiwH/X3ebmoiZGCIhlAguxGfn20OauA11B47m3P8swUNaVhg5JQOdN3xMCQGE5bmmx88S1jlRHw== Received: from DS7PR03CA0034.namprd03.prod.outlook.com (2603:10b6:5:3b5::9) by DS7PR12MB5862.namprd12.prod.outlook.com (2603:10b6:8:79::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7875.29; Wed, 21 Aug 2024 12:55:46 +0000 Received: from DS1PEPF00017093.namprd03.prod.outlook.com (2603:10b6:5:3b5:cafe::47) by DS7PR03CA0034.outlook.office365.com (2603:10b6:5:3b5::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7875.21 via Frontend Transport; Wed, 21 Aug 2024 12:55:46 +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 DS1PEPF00017093.mail.protection.outlook.com (10.167.17.136) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.11 via Frontend Transport; Wed, 21 Aug 2024 12:55:46 +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; Wed, 21 Aug 2024 05:55:35 -0700 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.4; Wed, 21 Aug 2024 05:55:30 -0700 From: Ido Schimmel To: CC: , , , , , , , , , , , , , , , , , Ido Schimmel Subject: [PATCH net-next 11/12] ipv4: udp: Unmask upper DSCP bits during early demux Date: Wed, 21 Aug 2024 15:52:50 +0300 Message-ID: <20240821125251.1571445-12-idosch@nvidia.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240821125251.1571445-1-idosch@nvidia.com> References: <20240821125251.1571445-1-idosch@nvidia.com> Precedence: bulk X-Mailing-List: bpf@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: DS1PEPF00017093:EE_|DS7PR12MB5862:EE_ X-MS-Office365-Filtering-Correlation-Id: ee0f758a-303e-441c-4c39-08dcc1e0931c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|7416014|36860700013|376014|82310400026; X-Microsoft-Antispam-Message-Info: Mad7PWFvBNpueg6vRmZZMMq51i08orbuSDro5HXH2Ng/coE72IOZ26zD1mUTDtDEom/XguoYWgM9Y/rweTBGomuI8ul//mtHWMcIPoOildfgjZ450Ca9RtTDddT0q56wqgLrt36Ju4FtLzwgakOS9zC6KzV0wMu78lZE3qrFbtrG9AzuAhoJiZsET1RI8You3NbJQQY7f6kiTowDu7IyBYmQnilCXTqyikpmalhB5lQ+QehVLFoRUtAk73aYYcCn28pOjMz1YyqNn9g8yYVx/jAXUL4BnDPOrdcNC3FqmOfeuJhtOgnR7T7cAkG5MBevP9qvblZW/eijlzqHPrG2Uz6B/HEAscPgBgAfXm7m534o9jH3cgfG1w1ioGX7S97pwKdwxjVtlrHnQU4opmwWvnD4MmnSE31Z+C0JqWpHgoTmxqp9Cn3uV8d4zRg58fewh3QfagaQJ36NYWDvf1YXHf3G6F+a4Oc5q+yCa4l6HbDisRfPaoMCl+FHZ2BX8U524tKCMX3YaaG+YqG9q6fET4HLxGlnU1S/9RCc9arpq74RAn940ArdeI8eB8K3cRhV4owc8dDSM1atYT1wbhIYLGOHj17+WUibonjNSs4JAZegdMWyHWKOs2swk93MGuljilw6NeuPr05HAmSP8AR6j3IeVIQks+U5f7uS7ZzgiLGRANf8NtNZGXOH8rv2DnCYSWWZEGMMSiTOxRo8mR/td9EfyejzGk03f6ZzIe9OwviseadS7aX8naHgjs3oTIXszJsYPBOzG0E3gvrKYG8k2xsEQyoDHi1kQLsmWcdtMmMhglaG8eVC3gAco2nx32NZL1FxKFTMnsKqt3RnyxD1yZCGEQA6KgpWehYxdo8HjAJ2UuD8InZHLdUex+JJAieih1hlCD4TUc/XRSQ76pc1vMAr+XRAywrJe1Iu+rIXeG2vZsaxRZSfznBI3hqzNHv3P/enARzf3dH3/ylxzgEKaB7Op+3zoPQuKtiW+XRUGbVTgu+iv6mEAoIHXA7lxSiv+cdrscCNmLe8meJFbNipdXmCj+wbOFyacHdnAsfWkZcZbwohsixIbw+qvxUEzvpJb70PHZE0up1h1H9V+0rksJQrH2LZ5Hz958J2vOnEFXyTeU1mVI/G8Q50AVFf7cvbmm13Rxa4LAFzW7jW0tThlu4nAtB4u4gnZdLOR1QiBk16nN7zQmmKPPxw5/DT7VdwwqdrWvp+J6QEnmE0m5lYsrzIcZUz/h34+WL9Hg6pw5cqi5ISalZoLJdFNNJ6VbB+kttafMkMzQy6icyud54j37N35zgQ0BBN3cxgLcg713JJvI5Krib0gIQlIXhcVZdaTl3tYFbSpucb3N8qGYNDzplMbGpqdYqPuFJrX0N8c8RSWsV/5Bu50D9OP4CQYA3zmcqeHKTx4bn0S493+QK5XsBtD8Q7nDjKW5y/tUCAJjw= 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)(1800799024)(7416014)(36860700013)(376014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Aug 2024 12:55:46.3145 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ee0f758a-303e-441c-4c39-08dcc1e0931c 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: DS1PEPF00017093.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB5862 X-Patchwork-Delegate: kuba@kernel.org Unmask the upper DSCP bits when performing source validation for multicast packets during early demux. In the future, this will allow us to perform the FIB lookup which is performed as part of source validation according to the full DSCP value. No functional changes intended since the upper DSCP bits are masked when comparing against the TOS selectors in FIB rules and routes. Signed-off-by: Ido Schimmel Reviewed-by: Guillaume Nault --- net/ipv4/udp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index ddb86baaea6c..8accbf4cb295 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -115,6 +115,7 @@ #include #include #include +#include #if IS_ENABLED(CONFIG_IPV6) #include #endif @@ -2618,7 +2619,7 @@ int udp_v4_early_demux(struct sk_buff *skb) if (!inet_sk(sk)->inet_daddr && in_dev) return ip_mc_validate_source(skb, iph->daddr, iph->saddr, - iph->tos & IPTOS_RT_MASK, + iph->tos & INET_DSCP_MASK, skb->dev, in_dev, &itag); } return 0; From patchwork Wed Aug 21 12:52:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 13771409 X-Patchwork-Delegate: kuba@kernel.org Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2060.outbound.protection.outlook.com [40.107.243.60]) (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 984C9196C86; Wed, 21 Aug 2024 12:56:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.243.60 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724244967; cv=fail; b=jp4hQuyNP82JaTOWoVf3zfxEJvKmauPZOHvZnOEziDgma/7PyBDcY9ix6j5m9CDWz8XOuZsdz6skRxoWpGWjFKxgnRT4kBmQ460R7Fb948iVRMndmDd2nRIY0FuDEqY1REKFfDHskNw3t+N0SxZGBYns78+IlQV9F2bmYExRvw0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724244967; c=relaxed/simple; bh=OaCIPvdfGbSfPL7cuj4kEaXsJcxZk4jrdEt+Ny/6l74=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=qt1fZ8xUzQPl1vySxj5zBad1XJvricQr4Dj4hNqXfvscvNlMQEveu5AF4OXLsHC2uBphaPcQoIls2WL+ZWUpjtDnUtk2cX6HRJ46/Zzb8+KDxTV/7CqdAu0Ze8njfjnRXS4mD2rNzr4PsZ5X26IW2/64Fx5pNgv++mpI9M1X9zA= 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=LPC/QFJE; arc=fail smtp.client-ip=40.107.243.60 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="LPC/QFJE" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=YFEnW135qKh/6ErNet0owxq69veSLvzHCHTq3WNLapxdgBZNUMAkkyHGlren1OiUKYS6g6+KESX2IGkxggvy7gV7fODPtScH7AAAHcL0UC2hb/H7xOf28HtawA/D4TZhcuh8XrYuLBWrAK6yc2fpFKy7EI0Hustq+zcfQGpJBrkOybvEBCEU3CQ0unDMF5/1YXVsztPUJ4gICLDSmXQ2Yv2qHXaENt06CRY+6jmOsse/SC9iYtuzu0fksF6v2NVrUaTQjwLsjo8idGkyPnrXfMO+e0/7LFjQZ2aDy0UOnBxaefWyhSu9b3YFM8/n2n/ZJ2rNMWhPw91yd8vLSlVOsQ== 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=nQGhjVTGOjUmV6hAdHsV+LhebKoICUXQVOD7UoLmzeM=; b=dTH+qQxN4SG0dGNy7Xx6UmYuuAUwUWml7QbSL4uGjJixupUVl1uolMa3roE85b+JOwYmIKrdIoyvUg/M8WzMnIdGuYF9MqOvSbF3+8TExyt9tOIOX4GOw9wIlASM9aFmi9zJjFHD2lSOqxtRriiGeAEEscp4l8h3zMykDzV1iK2YQjqaadoBpSGLhE2PbwCUiDIvB5bHcjUMpfw2fuEg3ScZr2sjODmk8m62FG9fii7vYR5ko0ZFHw+PIJ8KRb74K8Qy7cGLgEo4JMQ+j8gSemJ8N6julNvDkrKxKQv6JQ3nxcQbff1KjuST8oP6MumxRxPLctQM4lJGQqb7ncLJRA== 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=nQGhjVTGOjUmV6hAdHsV+LhebKoICUXQVOD7UoLmzeM=; b=LPC/QFJET5op+1kX/RpOf4SerYbC3ebIzq8UiTNDL0ejGPcqqCbteIsVrNnpGCaoa7Hezkw9Ux6FugMTSsZU/EZ7KhV4Z/5EUw/I8cbwptGhnOuUpq7EFDAOTv+Idem/6dY70T6NEtO3nqM4brzGqsn7Oyc3dLTOF01TH3VQC+lVxkRxfGdUBtCj1EATljof892rsz2pWcPBNwqJMlHsbO09mzLKMSmPxwwtIeOm0hRLYXeJKg791MOvHlXjVetjZfcdDNsuiqvhLZ1/lqisx0hp46jZ7sECCS+GQzX5zKQOHYqG2uA61ZhErJdQoE1dSlEnayDV96DmABUEMokItg== Received: from SA0PR13CA0026.namprd13.prod.outlook.com (2603:10b6:806:130::31) by CY8PR12MB9034.namprd12.prod.outlook.com (2603:10b6:930:76::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.16; Wed, 21 Aug 2024 12:56:01 +0000 Received: from SA2PEPF000015C7.namprd03.prod.outlook.com (2603:10b6:806:130:cafe::aa) by SA0PR13CA0026.outlook.office365.com (2603:10b6:806:130::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.13 via Frontend Transport; Wed, 21 Aug 2024 12:56:00 +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 SA2PEPF000015C7.mail.protection.outlook.com (10.167.241.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7897.11 via Frontend Transport; Wed, 21 Aug 2024 12:56:00 +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; Wed, 21 Aug 2024 05:55:41 -0700 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.4; Wed, 21 Aug 2024 05:55:36 -0700 From: Ido Schimmel To: CC: , , , , , , , , , , , , , , , , , Ido Schimmel Subject: [PATCH net-next 12/12] ipv4: Unmask upper DSCP bits when using hints Date: Wed, 21 Aug 2024 15:52:51 +0300 Message-ID: <20240821125251.1571445-13-idosch@nvidia.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240821125251.1571445-1-idosch@nvidia.com> References: <20240821125251.1571445-1-idosch@nvidia.com> Precedence: bulk X-Mailing-List: bpf@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: SA2PEPF000015C7:EE_|CY8PR12MB9034:EE_ X-MS-Office365-Filtering-Correlation-Id: a68853a6-98c3-46e2-ce20-08dcc1e09bb7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|376014|7416014|82310400026|1800799024; X-Microsoft-Antispam-Message-Info: JT9ULoowq3f/F48FAi1WeGrdU7WtNR/Rf5+4q3prVMKq0cp/nSD3QGlUMbfg1/8N7e4gQI+RbtNKnxaM7Lp9I+OPKSYfpLYRxBpFt5eqy4t8+1LggmAjss0qYbe7Sevt3QIInp1OuWw2RAi/U0QlWF1M9tbiidmzdVazvBFo+6z5ZVIMLeNnrnUZxz1lleOqD/9iDdKQshVDymjdvUwFrn3RVMZT+LVygfb+xXDMwWpcOp9vymazcQVciZcU6+JT0sOwCSj1EvQtXyZt3EAgm3qKRcJKe37HeXFy4XEAaf6QNo1LulL9M3qzTolkMwqgJz98wigmgbu2+b90WnbqAoYxMsZKXnddMeW9LoZgb3QoCTnW4Es9ypa8+mzkEZkM3lKsovdH9/548cm9BfTs9H0eHkCdkTl97qIWU+cE1R6m7ixk0zSQtdwKwoBub95MySNPMO4uCz6hO0kU8fpduioyIkFeKNJYtOXaY0Uw/skinZV2PkpJXmkZP/j4hLhgKbwXrVJP8vjsgNCK31y6v5no2XzHraTsm1frcRGOUEI/cRqBeij6simy8pMI0d5gs+rdHVF1Vr45GF6q+6xe+m0sD5PJw+eS4gQxtAJg8WGGAINpS2G1ijmzCXGax60oDo5rZW1n1UIN5FHz5iGHnFp2Qje8pdLDIiudxb3w0vtB7WX6MOmAcNZmmvTVonN1l6latvwpB+SG4LgPiWFIeM7OeUY5jrgNNFTerRoh3TKgMgfpTMdLR5fDDpZwoF3xYfuL9cnWMmgb00S/kHrMop+aYqOgQ1Hn+YSJCzLWV/5HbiFwYU6OX+A2WTgNid9EnQ9OwPKRhX5e4RAnLyXeq/i332eWB89BCufP3RKS8RIe5F2otSpWaWuZWWkApy/iB7E2DNeqygaMhqcMgo4lNSopOTF4TrIzmfkkFBIRixno0QmswUEPtGEK16Ygbsk6kMlafZMx9HgwTR6CtkUcE0fjKKaqZzfHYrjzckTIFh3vz+H4ul691k35GVChBhMxSjHY9tJSrsF5c/bKkoIDCBvmvkoPKrOVNQhk5gkrejMjDJhRArtm2WvgCpHd+DaVxka0iwX1K0fIvLsLnBL+UlzLnXKxXtm/TZVAqobkHym8l/WxjnL6+jY6PwM7a1ZurIYAs46xyMP7sAzmDOX90RChvkuNS3FM1ut8Re2KGpufpgQ+Xdb65ZKF7AfS2WHPLUKv9MPA2njHsE+tG8cn8v79VqDsu8gtm6hqOmGCcswJp6uXnYw984Y3IR9ASWKJGzX8Jg9gY+nuQw/WJlPH3kYoOUV2aziKxN1e384dQAXON1nY8HEgxGeyNSE4RErveoDq2rRrzC7k11TRbZZuELOGirYdA5oswbsrj9b/0/FtkVn4ESv5hKliTkLs5GOS74hwbjNFUmjFX0bZwwFt1RFAYJyO5t4yvT9jXs6/K2iyfp5N2O23Tk4TcOKd7tpR 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)(36860700013)(376014)(7416014)(82310400026)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Aug 2024 12:56:00.7554 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a68853a6-98c3-46e2-ce20-08dcc1e09bb7 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: SA2PEPF000015C7.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB9034 X-Patchwork-Delegate: kuba@kernel.org Unmask the upper DSCP bits when performing source validation and routing a packet using the same route from a previously processed packet (hint). In the future, this will allow us to perform the FIB lookup that is performed as part of source validation according to the full DSCP value. No functional changes intended since the upper DSCP bits are masked when comparing against the TOS selectors in FIB rules and routes. Signed-off-by: Ido Schimmel Reviewed-by: Guillaume Nault --- net/ipv4/route.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 524b70ab77a0..f6972b24664a 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -2160,7 +2160,7 @@ int ip_route_use_hint(struct sk_buff *skb, __be32 daddr, __be32 saddr, if (rt->rt_type != RTN_LOCAL) goto skip_validate_source; - tos &= IPTOS_RT_MASK; + tos &= INET_DSCP_MASK; err = fib_validate_source(skb, saddr, daddr, tos, 0, dev, in_dev, &tag); if (err < 0) goto martian_source;