From patchwork Sat Apr 22 01:47:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Tu X-Patchwork-Id: 1772208 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=P5yBZ+vX; 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 4Q3Dmf2bZBz23s0 for ; Sat, 22 Apr 2023 11:47:46 +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 1pq2Lj-0002Gz-Pv; Sat, 22 Apr 2023 01:47:39 +0000 Received: from mail-bn7nam10on2049.outbound.protection.outlook.com ([40.107.92.49] helo=NAM10-BN7-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 1pq2Lh-0002Dw-Tl for kernel-team@lists.ubuntu.com; Sat, 22 Apr 2023 01:47:38 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=a/DLImzylmPzMyUTnxx8yxPPWhZKoIBEN2DIxTsLjHkLvbRppFYa4BPU48zY9n8mOSUZ64eOPMvOfXBUvQXmq7BFOJn3OjEZH0WGtdyZsYVV5qeHrpA3f69ZHd8eGbXB2TsYWCiMSzepLFwbFPp3lph7dK+VM+GVCXX6apfqD+3UsSwBSiPOsShNxPHjlfBWqFBPkzdSYb5gra6Cek4XshVBbkMFx1HFCZRHvQ3wWIeNETLhbaDk88eWs2/8YxNnelOGbFhmY+n8H1h2syGTPq2UrshjM9L3tz3ZTOtVXdfBwu4ua3q8VXWy5txz0gO8375JDtWEHrnTP3C8ltOg+Q== 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=mylrxo4vzda4L+Pk0dnIsd5pt1mCm51S3rZyEMDH0g4=; b=NuyEQQE+xsqud5ejQwpEm2dv3Mvxbkxxlw0rSB6U6uImpC39JLQ0ExtOykdG8Tn2wY8eVA3s7FKk7DdqicKq/zek5/jNZ5XtljR9HazxckWGVb8YsWK1RJLlSss2SKaL0UrqB1UyA+aHjMmR0aMzJocBPaIii8fq1L5rx1uqWXg/w5Ceiaqs+8joZx9L9Xn7izfCU7gpIZvSsVEYt1l4vWNvGauUS3sUNFkUXlDruT4O2iZ6di5PIiRWb5zHmm5jLaeSJsqYH7292Dbkdwo/XGnB+101Epsg4tuNXioJttD5y3Uz11/LNGoTYp7On/ndmK61lo2UlWVIncnvYs5CAw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=canonical.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=mylrxo4vzda4L+Pk0dnIsd5pt1mCm51S3rZyEMDH0g4=; b=P5yBZ+vXrXqNjNEwPnZOM/gtp+QPtUM2Tg6EzrjRFz9k69NsyyBZFRoSkg9epropFgDTP+BkpgzklM79WeTiTvKCm9mBYoNvnFvOTeHUf0GE7kI9iHbB8+CuTYigGJKdQZ4hZgwKkXdgQgNEEovJ21Andy5+yXUNTII0ezFPhrGcv/KpQZQydc4Zy5KxfWz3kFhMe5GcdE62gjSAfxNwWU11QTkagFnzfMF+08w6kzzI6JToBnOfD86Z9KmUGzW5Qt8B2lZew7GL10JffLTd9KOVJanS0P9F8rlWPxgUsHIlys3cOrpscU0PkkpUeQM0hQ+wK22jG9kFuIw37j0Nzw== Received: from DM6PR03CA0084.namprd03.prod.outlook.com (2603:10b6:5:333::17) by IA0PR12MB7601.namprd12.prod.outlook.com (2603:10b6:208:43b::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.22; Sat, 22 Apr 2023 01:47:34 +0000 Received: from DM6NAM11FT081.eop-nam11.prod.protection.outlook.com (2603:10b6:5:333:cafe::e0) by DM6PR03CA0084.outlook.office365.com (2603:10b6:5:333::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.25 via Frontend Transport; Sat, 22 Apr 2023 01:47:34 +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 DM6NAM11FT081.mail.protection.outlook.com (10.13.172.136) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.26 via Frontend Transport; Sat, 22 Apr 2023 01:47:34 +0000 Received: from rnnvmail204.nvidia.com (10.129.68.6) 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; Fri, 21 Apr 2023 18:47:21 -0700 Received: from rnnvmail205.nvidia.com (10.129.68.10) by rnnvmail204.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; Fri, 21 Apr 2023 18:47:20 -0700 Received: from mtl123.mtl.labs.mlnx (10.127.8.10) by mail.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 via Frontend Transport; Fri, 21 Apr 2023 18:47:20 -0700 Received: from sw-mtx-002.mtx.labs.mlnx (sw-mtx-002.mtx.labs.mlnx [10.9.151.106]) by mtl123.mtl.labs.mlnx (8.14.4/8.14.4) with ESMTP id 33M1l76W008750; Sat, 22 Apr 2023 04:47:16 +0300 From: William Tu To: Subject: [SRU][F:linux-bluefield][PATCH v1 5/5] Revert "UBUNTU: SAUCE: net/sched: Provide act to offload action" Date: Sat, 22 Apr 2023 04:47:06 +0300 Message-ID: <20230422014706.594733-6-witu@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230422014706.594733-1-witu@nvidia.com> References: <20230422014706.594733-1-witu@nvidia.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT081:EE_|IA0PR12MB7601:EE_ X-MS-Office365-Filtering-Correlation-Id: 27a01857-2ad9-4d03-04e4-08db42d38b15 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2S9OW1bm+51Lu49OdItZVQyJmRq44IS8DFGExhItreo0J4OTfSmgGuiWNmYWCpaaYSpdf2OwA6RvYl/ucPiTKIFK+q2PIH6TffuXyNS2ji4efPpleSCw6TWe6qOCg8wgHBuvawHVGk8KXNrCoSjH3PyjVwUAWnzy9Vg/aM5V2uazsk4q9y9KJskoRUcwzVAVeusIB4DVQlcRYl1vzbq0+V2S70S2WHLgoJyUlvKOh538l0smGD2uoYQPPTfQ/8A7spk3lWYuFj4yMtOuqK8t3qMjHenbP6jT0OxsjAWMxNWgy4OZdXbaNCZU0c5Zp+wusUSgHTixye9nxmu/2LqnFqoK/tWyUlR7nUH6KDippUflRNS2Pqm5v2K4TCgXwUTZheqkKovsyGp33djhrYAw0QaU6QCwpM2NalMhTCyrwt7A13IzrifNjLB8Wjs5D95pPeCCoHk20C28fa1eXXY79ymvc255LAeVA2gvjuFcPXJcBrC2gk7kV/2CVOdr7/LE1Bfs3i60RRbQiRvu603l4EapZYfehnNfcomydz3xRdDEOIv8JvuKP6VWzAd8rbVD2pTO2BzTSYIXJeLUNKvcC4Y7E60aMCQ/PAEfDhd3BBlF1ujgTarO14LQNp/gUnFWGGTqcMJoCq8t4r7AWChIkCsYYNWViFfg6VUQsTudLFcBqaaXccfE0Q9B5fTnWk7j9qBW4KvtWw3xKFDwA+4YHFT4nyBvrZNDbFoixhenkre2YtT/5Ispy2+OODE2gbcrVP2W7wC5F9Nbc2NR2EB1cQ== 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)(136003)(376002)(396003)(39860400002)(346002)(451199021)(40470700004)(46966006)(36840700001)(82740400003)(356005)(4744005)(2906002)(7636003)(40460700003)(86362001)(82310400005)(40480700001)(478600001)(54906003)(34020700004)(316002)(70586007)(2616005)(41300700001)(70206006)(4326008)(6916009)(107886003)(26005)(8676002)(1076003)(36860700001)(36756003)(186003)(6666004)(47076005)(336012)(8936002)(83380400001)(5660300002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Apr 2023 01:47:34.0594 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 27a01857-2ad9-4d03-04e4-08db42d38b15 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: DM6NAM11FT081.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB7601 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: dann.frazier@canonical.com, paulb@nvidia.com, vlad@nvidia.com, yifeid@nvidia.com, bodong@nvidia.com Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" This reverts commit 73cbac8f27c9a13a417f05733786e5c1f11e5d7c. --- include/net/flow_offload.h | 1 - net/sched/cls_api.c | 1 - 2 files changed, 2 deletions(-) diff --git a/include/net/flow_offload.h b/include/net/flow_offload.h index d9e2e5d905ee..e9686f7e5cdf 100644 --- a/include/net/flow_offload.h +++ b/include/net/flow_offload.h @@ -166,7 +166,6 @@ typedef void (*action_destr)(void *priv); struct flow_action_entry { enum flow_action_id id; - void *act; action_destr destructor; void *destructor_priv; union { diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c index 384a4d815849..5d933c9e9cc0 100644 --- a/net/sched/cls_api.c +++ b/net/sched/cls_api.c @@ -3518,7 +3518,6 @@ int tc_setup_flow_action(struct flow_action *flow_action, struct flow_action_entry *entry; entry = &flow_action->entries[j]; - entry->act = act; spin_lock_bh(&act->tcfa_lock); if (is_tcf_gact_ok(act)) { entry->id = FLOW_ACTION_ACCEPT;