From patchwork Mon Apr 3 21:58:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Tu X-Patchwork-Id: 1764628 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=YQPebVfk; 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 4Pr4Xm40NJz1yZf for ; Tue, 4 Apr 2023 07:58:48 +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 1pjSCI-0004CT-1R; Mon, 03 Apr 2023 21:58:42 +0000 Received: from mail-dm6nam11on2071.outbound.protection.outlook.com ([40.107.223.71] 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 1pjSCD-00049W-BI for kernel-team@lists.ubuntu.com; Mon, 03 Apr 2023 21:58:37 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iZfrDMOcR2FHVbc/pBo0GY+xcjLsEH1gh0kd2QyOdWFVMdhB4mvKYthn4BPFBp4RI3ngV3hLcBmGWbjJVNWgDGHFYyTHSE5Cm2vPYpawleW56SKHRJKETJFemx5/kdRo9m1D9QHjr/gjh4lbLLEdFje/pAco/2Nl0EZnxKGHTNwshV6wq0gw8B7YJv9vc1hw4MgCGF84c/U4XUMxLD7h61keZ+2QfNOf7adsPZVD+fAyJP5zK1b5FyU5DK8txk1TRX3cPHjACYIVltkZkbXm0MPnaFCjlZvV82DYwHMALoLfZcPMvXuhtJtxG6zDmrldMXzJ7WkFeQk2HlfRPW4Tqg== 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=5vO8rO9OMeXfjbfrWueYawzpCUQrlabpvd+xXfJx9no=; b=fdZIgjYvG7J+TL7tr+fXgVVdsA50wfd0Cq4pw+WbGDTEQ/wWbFN/dkaQTkft4+b3dOX1TsIdh0sxxvMC9BrtuBXOxPvBPvyE0mWquF75i0VoVm7wW+HMq5LtdpHoXQMtJh9X00wL20pL/TCEMY59/ipKx+v2EVV9/m7GyxWwShggdbr6vIUcrVDhbkXANE0oM9GEg6CqoTm6Sq20S8nky+CQnNMLl73U1TUhNrDANNLtaGyToMCNmZwz8mxt5QohPrr0QSykr5PhOGHlZXyiNkrd36jw2WWY6ltKA6QfdJlAR28/xxzXzHmXGV/R9CKaOzMOmsSEJ5I/DZ2kXzuIxQ== 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=5vO8rO9OMeXfjbfrWueYawzpCUQrlabpvd+xXfJx9no=; b=YQPebVfk/7qlwAuRQdfZh+ytcdZZazXkPUia8mMg2y0KExhG5zP8HAxbUHxYbEdqw91VDNpvoa+mnqm8tVBjEAInrwcAy+R6eGGnC8CyTIweiAneOGGHonYMR6YqpplLYT1w1J0SbFRKx6Ox3Ht9zUj1jzWfsOVrdUd37cf7T0bK9GROthML1zco3cnGDN1oU2RU4sRLvcyz3W0HDHmeZw3r/b8COugNRWhWbJTpvO0XwnZVPdc+Ft1tvPS9FyPmTs92BB/9Wcc2CBsqCz7LrCMu8/bkgWbX0ahxGo5C6Iga4ln3dinY4DQu1IhqoHs+wF/GlMXOKUb7Kxv12m9xnw== Received: from DS7PR03CA0254.namprd03.prod.outlook.com (2603:10b6:5:3b3::19) by PH8PR12MB6745.namprd12.prod.outlook.com (2603:10b6:510:1c0::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6254.30; Mon, 3 Apr 2023 21:58:32 +0000 Received: from DM6NAM11FT107.eop-nam11.prod.protection.outlook.com (2603:10b6:5:3b3:cafe::90) by DS7PR03CA0254.outlook.office365.com (2603:10b6:5:3b3::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6254.20 via Frontend Transport; Mon, 3 Apr 2023 21:58:31 +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 DM6NAM11FT107.mail.protection.outlook.com (10.13.172.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.16 via Frontend Transport; Mon, 3 Apr 2023 21:58:31 +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; Mon, 3 Apr 2023 14:58:20 -0700 Received: from rnnvmail201.nvidia.com (10.129.68.8) 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; Mon, 3 Apr 2023 14:58:19 -0700 Received: from mtl123.mtl.labs.mlnx (10.127.8.10) by mail.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.986.37 via Frontend Transport; Mon, 3 Apr 2023 14:58:19 -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 333LwBaS018545; Tue, 4 Apr 2023 00:58:16 +0300 From: William Tu To: Subject: [SRU][F:linux-bluefield][PATCH v2 3/5] net/sched: flower: Move filter handle initialization earlier Date: Tue, 4 Apr 2023 00:58:09 +0300 Message-ID: <20230403215811.252026-4-witu@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230403215811.252026-1-witu@nvidia.com> References: <20230403215811.252026-1-witu@nvidia.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT107:EE_|PH8PR12MB6745:EE_ X-MS-Office365-Filtering-Correlation-Id: 500c80f4-a412-42b1-c2cb-08db348e9036 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SBD08YLwxW/lH4OXZpETDeN4MfcW5UK9u2YFKdDumpu2rakgCUj0KK+zL6Q5mjTW6xNH72r73UnyvU4y0ou1aUzYwHvvxMUaRh/qw67EBrZ7mrEKKaouGhdhAMvsRGV22Nsw/iqxUObuoeA6m6q/keRECJpXzu7YoQ2BTxqA7sPtifAb9f45YaECxGj6Va4FpBPojVA9p9Pw45GWr5fZJiYELm1+SeQP0jINVPoxSfuJhP3cpTh4u8MEpNOKhXgb1U1MlaAsSZLRDgllqbv1s93b2KGc71rcxdj0o8MFoytQZEr8WjP9fB9XdJrSXD3ZwADDfUuetdshnZRobj8N5cSGXu5Kw7uHb10ZxDOW2GrUix3+8PZHgR4mUJQZH6gADrB7DMX24HOT811NKHiM496IQi09nd/0PcobuzQR/aDApzEhYSFhZlzBujsatKRloVoHu1eXC2Aj9coSc58cShWeok/7i2WNFdfSNjU8GSuymtcX0KiBWY4b9A6gUq1vWR/XNTBCYBXDVWGCRHDMpA0zssnFb2BuO4Ot/Xi9Maf27ig+SpGjy63QJ6gg/k788LhjQ7b0ScXZ3ZTvslccD1ZGj0wDx2KCaoVNd5JyKC15NdNF+MljSdPwsw2wvZPdmF37YfMgJ8EwO7KCJ/NEbAMCZ+8N8xadMOzIO2QaCPMlRpfp7H5s+9BWZMu4MrQ35XwxSJ0kgVrJ4xrjrcOhCsUynyWpwNR1AgdB5lEzW2DPFlNqpLTH6cXMae8w9iP6ccM0uaAclA0uQ7bRVdZWKEY+6ilaSXt+17fYa/aErYbLMSn4Gm8CHZBwES/7nqiqDwunN0YRdN+yIv79Y7be3Q== 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)(39860400002)(396003)(346002)(136003)(451199021)(46966006)(36840700001)(40470700004)(316002)(356005)(8676002)(70586007)(41300700001)(82310400005)(70206006)(4326008)(6916009)(5660300002)(54906003)(8936002)(7636003)(82740400003)(478600001)(86362001)(34020700004)(2906002)(40460700003)(36860700001)(966005)(40480700001)(47076005)(26005)(6666004)(1076003)(186003)(107886003)(36756003)(83380400001)(336012)(2616005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Apr 2023 21:58:31.1003 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 500c80f4-a412-42b1-c2cb-08db348e9036 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: DM6NAM11FT107.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB6745 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: bodong@nvidia.com, vlad@nvidia.com, paulb@nvidia.com, dann.frazier@canonical.com Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Paul Blakey BugLink: https://bugs.launchpad.net/bugs/2012571 To support miss to action during hardware offload the filter's handle is needed when setting up the actions (tcf_exts_init()), and before offloading. Move filter handle initialization earlier. Signed-off-by: Paul Blakey Reviewed-by: Jiri Pirko Reviewed-by: Simon Horman Reviewed-by: Marcelo Ricardo Leitner Signed-off-by: Jakub Kicinski (cherry picked from commit 08a0063df3aed8d76a4034279117db12dbc1050f) Signed-off-by: Paul Blakey Signed-off-by: William Tu --- net/sched/cls_flower.c | 62 ++++++++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 27 deletions(-) diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c index 0b428f5ca73b..0f5ce744bd51 100644 --- a/net/sched/cls_flower.c +++ b/net/sched/cls_flower.c @@ -1639,10 +1639,6 @@ static int fl_change(struct net *net, struct sk_buff *in_skb, INIT_LIST_HEAD(&fnew->hw_list); refcount_set(&fnew->refcnt, 1); - err = tcf_exts_init(&fnew->exts, net, TCA_FLOWER_ACT, 0); - if (err < 0) - goto errout; - if (tb[TCA_FLOWER_FLAGS]) { fnew->flags = nla_get_u32(tb[TCA_FLOWER_FLAGS]); @@ -1652,14 +1648,44 @@ static int fl_change(struct net *net, struct sk_buff *in_skb, } } + if (!fold) { + spin_lock(&tp->lock); + if (!handle) { + handle = 1; + err = idr_alloc_u32(&head->handle_idr, fnew, &handle, + INT_MAX, GFP_ATOMIC); + } else { + err = idr_alloc_u32(&head->handle_idr, fnew, &handle, + handle, GFP_ATOMIC); + + /* Filter with specified handle was concurrently + * inserted after initial check in cls_api. This is not + * necessarily an error if NLM_F_EXCL is not set in + * message flags. Returning EAGAIN will cause cls_api to + * try to update concurrently inserted rule. + */ + if (err == -ENOSPC) + err = -EAGAIN; + } + spin_unlock(&tp->lock); + + if (err) + goto errout; + } + fnew->handle = handle; + + err = tcf_exts_init(&fnew->exts, net, TCA_FLOWER_ACT, 0); + if (err < 0) + goto errout_idr; + err = fl_set_parms(net, tp, fnew, mask, base, tb, tca[TCA_RATE], ovr, tp->chain->tmplt_priv, rtnl_held, extack); if (err) - goto errout; + goto errout_idr; err = fl_check_assign_mask(head, fnew, fold, mask); if (err) - goto errout; + goto errout_idr; err = fl_ht_insert_unique(fnew, fold, &in_ht); if (err) @@ -1725,29 +1751,9 @@ static int fl_change(struct net *net, struct sk_buff *in_skb, refcount_dec(&fold->refcnt); __fl_put(fold); } else { - if (handle) { - /* user specifies a handle and it doesn't exist */ - err = idr_alloc_u32(&head->handle_idr, fnew, &handle, - handle, GFP_ATOMIC); - - /* Filter with specified handle was concurrently - * inserted after initial check in cls_api. This is not - * necessarily an error if NLM_F_EXCL is not set in - * message flags. Returning EAGAIN will cause cls_api to - * try to update concurrently inserted rule. - */ - if (err == -ENOSPC) - err = -EAGAIN; - } else { - handle = 1; - err = idr_alloc_u32(&head->handle_idr, fnew, &handle, - INT_MAX, GFP_ATOMIC); - } - if (err) - goto errout_hw; + idr_replace(&head->handle_idr, fnew, fnew->handle); refcount_inc(&fnew->refcnt); - fnew->handle = handle; list_add_tail_rcu(&fnew->list, &fnew->mask->filters); spin_unlock(&tp->lock); } @@ -1770,6 +1776,8 @@ static int fl_change(struct net *net, struct sk_buff *in_skb, fnew->mask->filter_ht_params); errout_mask: fl_mask_put(head, fnew->mask); +errout_idr: + idr_remove(&head->handle_idr, fnew->handle); errout: __fl_put(fnew); errout_tb: