From patchwork Tue May 2 21:08:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bodong Wang X-Patchwork-Id: 1776041 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=Nvidia.com header.i=@Nvidia.com header.a=rsa-sha256 header.s=selector2 header.b=ob47ad5M; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Q9t3r59G6z20fp for ; Wed, 3 May 2023 07:08:55 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1ptxEm-0000eK-6l; Tue, 02 May 2023 21:08:40 +0000 Received: from mail-dm6nam11on2076.outbound.protection.outlook.com ([40.107.223.76] helo=NAM11-DM6-obe.outbound.protection.outlook.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1ptxEk-0000eB-Gz for kernel-team@lists.ubuntu.com; Tue, 02 May 2023 21:08:38 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=C9jM9x3dZ4T4M007U3DHZ8V/q2bKwM0991CRNeId/Uivj7A8i9vd+QK1t2f/Weokzz29A0/xwT7OQ4aHoU0G+cHJSqzB4Lx/wCfPKfvOGGz6NxHZol6IVfOAzVJ8XlxdqYR8fUSfXU+FahQ13v9vWsJ6uuR44UBHmBZccDKk4JotqupwVaYmESmfuDo6+YR2taBIrXPhQWN4tfUAcEYWDuJvYF2JV1IJoq+nsAisx9Pb5fC2zkUhQUmES2d/WVmspIhR3wY8FB9S283cNg3dfaFeaplDhcmkPCQyLRv247coxZBJtOvwioC23A6u38kQXahQ6a9zXKGt2uvf0I56tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=p38l6WRHsfgAPipUwZTlp+qjGJH/O/fZXmHn5R2xag4=; b=RnW3n1PDOcKZ4eUjfzuQqxshlu2CqBiW+mq6EmXVia9iO5XtdZtvrHQgpB3i4Z5/LocvDq5cFNpQJQnbp5StjDYM9C7YeHl3VA++SIiElxsNkpNiC2vV9gO5enX4BRDqRXXkuCLQpF4G4aHzr8/EpO3fO3yjc6+iTPk+e+xsOjihGYLYQE9+KkZj+0MOS25yibQJhO4hmzU8aIbOiV8CHb1XTzQJWu28kTaf80c81zOlRTAUBDf7Z7Dby8ff8qN3iLhgUAw/aHJwo6OBxlLWlA2w7j74tMaK0dlP1+HXZsgT3S8H96GeEWNR4sbh8ZjNLcHbePIAYAq0OvpM5ECMXA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=lists.ubuntu.com 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 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=p38l6WRHsfgAPipUwZTlp+qjGJH/O/fZXmHn5R2xag4=; b=ob47ad5Mu2Cmwd9olO3ySzZA20BMLA10MuyNQe9FUhGOIy+No7s+MzH/MkXNSYIzt6lYaUb29AU/dfAbbaXAOZQDj9kZ3nBDEEbCLe4miK5YYWjwjbahgq9HMpEevLzf+O8hfDDE+98rzMRuupJqE6zSKpfItxLlwzUj+HRqO8DAm9ulJjpJD1XdnNKneQirRgOZTWuOW9XUzgXUycY2sXRWZNEqURxqNT47JJSyS8kdpkjprCRRGkIyJr6JeHYWKRIhW8SkJhUVY0AfwcyQRTyi4J53igGz/gKygbJ48lp4iGXtBrgFXpjSmTFWENxAbv82M0UxRbMvRTLNv+BFqw== Received: from DM6PR07CA0045.namprd07.prod.outlook.com (2603:10b6:5:74::22) by CY8PR12MB7338.namprd12.prod.outlook.com (2603:10b6:930:52::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6340.31; Tue, 2 May 2023 21:08:36 +0000 Received: from DM6NAM11FT075.eop-nam11.prod.protection.outlook.com (2603:10b6:5:74:cafe::ac) by DM6PR07CA0045.outlook.office365.com (2603:10b6:5:74::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6340.31 via Frontend Transport; Tue, 2 May 2023 21:08:35 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by DM6NAM11FT075.mail.protection.outlook.com (10.13.173.42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6363.21 via Frontend Transport; Tue, 2 May 2023 21:08:35 +0000 Received: from rnnvmail205.nvidia.com (10.129.68.10) 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.986.5; Tue, 2 May 2023 14:08:30 -0700 Received: from rnnvmail204.nvidia.com (10.129.68.6) by rnnvmail205.nvidia.com (10.129.68.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Tue, 2 May 2023 14:08:29 -0700 Received: from mtl123.mtl.labs.mlnx (10.127.8.10) by mail.nvidia.com (10.129.68.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37 via Frontend Transport; Tue, 2 May 2023 14:08:29 -0700 Received: from sw-mtx-061.mtx.labs.mlnx (sw-mtx-061.mtx.labs.mlnx [10.9.153.25]) by mtl123.mtl.labs.mlnx (8.14.4/8.14.4) with ESMTP id 342L8Qsu006679; Wed, 3 May 2023 00:08:27 +0300 From: Bodong Wang To: Subject: [SRU][J:linux-bluefield][PATCH v3] UBUNTU: [Config] bluefield: Enable CONFIG_NF_CONNTRACK as build-in Date: Tue, 2 May 2023 16:08:26 -0500 Message-ID: <20230502210826.1279340-1-bodong@nvidia.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT075:EE_|CY8PR12MB7338:EE_ X-MS-Office365-Filtering-Correlation-Id: c8025b19-29e0-47b0-c17e-08db4b5164c0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YB97Qp8rTtM39eI7nVgrXLXcfk1rGYk16JGJKEgGMR1jxhlNEf43fyFlZJzAFmQehoqPa0r92KfYfQ5qKhobB27yc1BTNkyXpS/3msX0NtfOUZa3zRJ0e6SOMpgEMvd/SX+vo5+r2wHFpCzc4rwd42CYB7AbJElwDa7xSdZddmZlRIGnfs+Zb2Nj4+afdxarNqIe10US+9zdLAI8QOEvbq79o8MAqqWN1eKCZuaphOIkBztd2ea/5c64kuYKpI8f12AAD0sHnQjM/jPJmM3Q4LiUZJxaJXawFt9t2mxy2cFtWuBuixIH8i7nyJ7G1aXEdu1qgZ09KsftKxy0gttHdIf7CYfZ7DRkO9LFKCELiZzMZoYcxHGxx0WhPKQsjW2Q3GBJHTTNM1RT/cJRIrXndGXLlAWkUrv1Z5yM5ukkvqW4i+eTuuahimrEewOh1P7ipFNiQMHY7qQMzlg0UVRnWctNHQ/iPGIeoRBt9icXXfUUzTJmFc15K8Z9L5PBIlrvs2U5IwTWiiMsNz768pCoQLsRJZZe6Ul0UliOJkq92VRO6CZYY+5qKRBkYUSXeeKJBMX3tGAvXV2t57EChQlWpMRKS9UNsLVPKYkS4ZI3caoWRLKGabkzA/I8urepl3dO6QXGkPXOZ9IwAXGler9/jYuYfOgLnTSseTkAYuBGh5VV7JF30VR6MufAM6YZWLPor9OtdCizYCDJK4PBVJxBZa2RhOX1GYBLObqfcw6PMHEn8kAHC8rvTJaJ8TPvjn+d 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:(13230028)(4636009)(376002)(346002)(136003)(39860400002)(396003)(451199021)(36840700001)(40470700004)(46966006)(2906002)(86362001)(40460700003)(36756003)(966005)(6916009)(4326008)(70206006)(70586007)(478600001)(54906003)(40480700001)(36860700001)(2616005)(82310400005)(186003)(47076005)(5660300002)(83380400001)(336012)(8936002)(8676002)(356005)(1076003)(26005)(316002)(82740400003)(107886003)(7636003)(41300700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 May 2023 21:08:35.6439 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c8025b19-29e0-47b0-c17e-08db4b5164c0 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: DM6NAM11FT075.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB7338 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: vlad@nvidia.com, bodong@nvidia.com Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/2017600 CONFIG_NF_DEFRAG_IPV4 and CONFIG_NF_DEFRAG_IPV6 are selected as build-in along with CONFIG_NF_CONNTRACK. Also configure the annotations accordingly. Signed-off-by: Bodong Wang Acked-by: Tim Gardner Acked-by: Bartlomiej Zolnierkiewicz --- debian.bluefield/config/annotations | 3 +++ debian.bluefield/config/config.common.ubuntu | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/debian.bluefield/config/annotations b/debian.bluefield/config/annotations index 401a68cb3bc1..d5835cad4b66 100644 --- a/debian.bluefield/config/annotations +++ b/debian.bluefield/config/annotations @@ -3,3 +3,6 @@ # ARCH: arm64 include "../../debian.master/config/annotations" + +CONFIG_NF_CONNTRACK policy<{'amd64': 'm', 'arm64': 'y', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}> +CONFIG_NF_CONNTRACK note diff --git a/debian.bluefield/config/config.common.ubuntu b/debian.bluefield/config/config.common.ubuntu index f5f7959cdf74..04a83149cd7b 100644 --- a/debian.bluefield/config/config.common.ubuntu +++ b/debian.bluefield/config/config.common.ubuntu @@ -6138,7 +6138,7 @@ CONFIG_NFT_SYNPROXY=m CONFIG_NFT_TPROXY=m CONFIG_NFT_TUNNEL=m CONFIG_NFT_XFRM=m -CONFIG_NF_CONNTRACK=m +CONFIG_NF_CONNTRACK=y CONFIG_NF_CONNTRACK_AMANDA=m CONFIG_NF_CONNTRACK_BRIDGE=m CONFIG_NF_CONNTRACK_BROADCAST=m @@ -6166,8 +6166,8 @@ CONFIG_NF_CT_PROTO_DCCP=y CONFIG_NF_CT_PROTO_GRE=y CONFIG_NF_CT_PROTO_SCTP=y CONFIG_NF_CT_PROTO_UDPLITE=y -CONFIG_NF_DEFRAG_IPV4=m -CONFIG_NF_DEFRAG_IPV6=m +CONFIG_NF_DEFRAG_IPV4=y +CONFIG_NF_DEFRAG_IPV6=y CONFIG_NF_DUP_IPV4=m CONFIG_NF_DUP_IPV6=m CONFIG_NF_DUP_NETDEV=m