From patchwork Sat Apr 22 01:47:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Tu X-Patchwork-Id: 1772204 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=CozowRf8; 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 4Q3DmY3jWGz23s0 for ; Sat, 22 Apr 2023 11:47:40 +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 1pq2LZ-00028H-Rn; Sat, 22 Apr 2023 01:47:29 +0000 Received: from mail-dm6nam10on2089.outbound.protection.outlook.com ([40.107.93.89] helo=NAM10-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 1pq2LW-00027u-QK for kernel-team@lists.ubuntu.com; Sat, 22 Apr 2023 01:47:26 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YbzAgSOcTll9NUidBAckoukC23sQzzt/0OBBK722hCH4bMPowYBZG2CP/s8efah/jIfi9iHxpVefqz87uaa4k0jMrkSu0UA0Ac8m5VOLYSFsuVVEhU0k9nuGAG6HyHa745LBxKdvfndWbwdZaIZYF1MefAsdzLKB2DtSKVdDPHeLlORbDUtjPIKQiW1OKEeE57CvSJ3BiNnJjDi7E69LMhJgTDurg7WBZsDBTajsGyGds1tguBlhXN4KHpt2XK5CKaWacLlhqb2QMLwHAoAnbF/c10XGmik4YU0yrqZsUIJtfjqan0SwQGXYAgYv8rgYFB4ebP8eDgh9zFED/L30ow== 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=Zl7gUu8PLKbftdqO9cs1xf+9YpD8UVVu8EJ0f/dkC7c=; b=dvF2EN2ZuzGWHzaxKuGTQZ7vZnsPz7Xfmz1Ribwspm/EIRmoRWxUJf0LyDxG1h8sFi03E/M/yXnjgztcZoJCc/vsQOPFxBI8/daq41Or0RNcmJrSgyDdaiqOMhgidvvaxfNnn7UdRwK/vMXEu3fCT7W95ujxh7V6sRUeFRaxKH6B94mJiBpulc3eQ+8J+kJLIJGK5NXouQwgK8ktxfOwOJONbYJ/tSn0ReJScEJHE9MRB1ibSUOVJfaAAIBoOx6RrL5m90rqzc4PMEix+wJeKO+DiEWyzOkrmrZQscEgNK4V+jE/PPpeYhx2hHlEDiH8WhHtIde8Pr152szDSFE6bA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) 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=Zl7gUu8PLKbftdqO9cs1xf+9YpD8UVVu8EJ0f/dkC7c=; b=CozowRf8lP9kHalsLWmvXFr0OFgprOJ8jUdtrGMMcStfurhDPUrV+ULPvL37+BAK5t+EbjE6Ou4Bjr0Dl548LBnbiIeaaD2HAR4ToqFXEmGcFXWJqqHrti7AWr3LTCCegT/j3Li1ds/XUFlCJlLYgSm3d4VG9pzJ3HEM1j+D5ijjabw0yV0qRt4Nb0p/016TB/ETQQQ5L8MYwyY90CsSnODhsXteJuHczGC614/6yM2YMPj5cw+WruN0y2XlA+PVwjA/weJH+aBs+sFdKpxofNMeWT3BP4QL5pYG6pXOy/+GONYhfVri5R8QEPDS3nQQNdtFswuTrl3yowCOpBU58A== Received: from DS0PR17CA0011.namprd17.prod.outlook.com (2603:10b6:8:191::13) by DM4PR12MB5070.namprd12.prod.outlook.com (2603:10b6:5:389::22) 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:24 +0000 Received: from DM6NAM11FT024.eop-nam11.prod.protection.outlook.com (2603:10b6:8:191:cafe::13) by DS0PR17CA0011.outlook.office365.com (2603:10b6:8:191::13) 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:24 +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 DM6NAM11FT024.mail.protection.outlook.com (10.13.172.159) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6340.16 via Frontend Transport; Sat, 22 Apr 2023 01:47:24 +0000 Received: from rnnvmail203.nvidia.com (10.129.68.9) 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.986.5; Fri, 21 Apr 2023 18:47:15 -0700 Received: from rnnvmail204.nvidia.com (10.129.68.6) by rnnvmail203.nvidia.com (10.129.68.9) 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:14 -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; Fri, 21 Apr 2023 18:47:14 -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 33M1l76T008750; Sat, 22 Apr 2023 04:47:11 +0300 From: William Tu To: Subject: [SRU][F:linux-bluefield][PATCH v1 2/5] Revert "net/sched: flower: Support hardware miss to tc action" Date: Sat, 22 Apr 2023 04:47:03 +0300 Message-ID: <20230422014706.594733-3-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: DM6NAM11FT024:EE_|DM4PR12MB5070:EE_ X-MS-Office365-Filtering-Correlation-Id: 197092c2-7620-4a07-b888-08db42d38527 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WO0WrN0ifGR81zCFmxNu0Qq9nkvl6Rj3Ese1nXB2y2CoRO4799ocSh2d24pdTuaUCBwz0bUoaoYYrhKA38MgYwr+0qijcrNRd08wQEu5fXXLdTxhFlI3WUCUHbZABF9zskJ9kRQ2Nyk5+2lCg2D2c38sjnnB3NVo2J3G/TAnAhgMgg004WLX0v4oxAEWL6k28cdeFPE2Uyj9PHNTzaSM2Rg8serzHhq/DBVQHz7wWyXaXVM7RTehmkn0jAoCvvxqfnGriaMVbHLF5DQr/gbjtgNzBCBnFKdxFkFbVE1n0Hv4bnaZAQ46rqexaWDBVSvOaEldt2tOLyOZMXD0PIDGUxSrao4u/c4AUH8Pe1qzx73KlZWK69/hjx9+oXxWwARYVgM3znBVNdlqRghy0qeIj8+mH1EPnyFGFOQeJn9NwVY6L75E6T9jIO/VK2Imyvniiyz7rtgj4M8tNVdIu1nMC5GgHBL8giRHGrJFVTIWQfjd5PerYhoFqDy6Abs2IY4U18yDtnE8RAIlpFYT8x5noY/tjCrDFN9T7FR+DNZUTBVHHvwU/MNoBdR+ZYoHuxFBFOcJHKzV34YsvNZWoZirjSrvp0EElH93b/Nk1SOWU7ZBEOE6aUiWYRlWll0IK0LxgnKCJKjYvxOhD+J8PNKp4DdQc6sdMmfE7ixYvR68RD91hDMbIvPVPZCojyjwiuv7PKSjC6OdB7r4UtEOyL7bQrlYHvdjJN7FpfaV0TgD2rkTTFLzvYdGQlZBL+ANb3eo7s8lb5ZYEOHFsmeacfispDLfVO7CMWKGLQd4YcmOmH4= 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:(13230028)(4636009)(396003)(39860400002)(136003)(376002)(346002)(451199021)(40470700004)(46966006)(36840700001)(26005)(186003)(1076003)(107886003)(41300700001)(6666004)(336012)(47076005)(83380400001)(36860700001)(2616005)(70206006)(478600001)(40460700003)(34020700004)(70586007)(6916009)(4326008)(82310400005)(356005)(40480700001)(82740400003)(7636003)(5660300002)(54906003)(8936002)(8676002)(2906002)(86362001)(36756003)(316002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Apr 2023 01:47:24.1156 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 197092c2-7620-4a07-b888-08db42d38527 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: DM6NAM11FT024.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5070 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 85ec3adff4d54fefe9982025d591880b6bcfda83. --- net/sched/cls_flower.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c index 2431456a58cd..3ef5206cbcbb 100644 --- a/net/sched/cls_flower.c +++ b/net/sched/cls_flower.c @@ -532,15 +532,6 @@ static struct cls_fl_filter *__fl_get(struct cls_fl_head *head, u32 handle) return f; } -static struct tcf_exts *fl_get_exts(const struct tcf_proto *tp, u32 handle) -{ - struct cls_fl_head *head = rcu_dereference_bh(tp->root); - struct cls_fl_filter *f; - - f = idr_find(&head->handle_idr, handle); - return f ? &f->exts : NULL; -} - static int __fl_delete(struct tcf_proto *tp, struct cls_fl_filter *f, bool *last, bool rtnl_held, struct netlink_ext_ack *extack) @@ -1872,8 +1863,7 @@ static int fl_change(struct net *net, struct sk_buff *in_skb, } fnew->handle = handle; - err = tcf_exts_init_ex(&fnew->exts, net, TCA_FLOWER_ACT, 0, tp, handle, - !tc_skip_hw(fnew->flags)); + err = tcf_exts_init(&fnew->exts, net, TCA_FLOWER_ACT, 0); if (err < 0) goto errout_idr; @@ -2899,7 +2889,6 @@ static struct tcf_proto_ops cls_fl_ops __read_mostly = { .tmplt_create = fl_tmplt_create, .tmplt_destroy = fl_tmplt_destroy, .tmplt_dump = fl_tmplt_dump, - .get_exts = fl_get_exts, .owner = THIS_MODULE, .flags = TCF_PROTO_OPS_DOIT_UNLOCKED, };