From patchwork Mon Feb 6 17:43:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Blakey X-Patchwork-Id: 13130458 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4253DC636D3 for ; Mon, 6 Feb 2023 17:44:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230022AbjBFRo1 (ORCPT ); Mon, 6 Feb 2023 12:44:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44970 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229975AbjBFRoY (ORCPT ); Mon, 6 Feb 2023 12:44:24 -0500 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2079.outbound.protection.outlook.com [40.107.223.79]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A580B2A16F for ; Mon, 6 Feb 2023 09:44:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=df8jN8rUWWC9hFVz8ml59xujbL5itS1XTwZsuX50SjaDlUcr4QwlT+ZUjSm3PO5Prr4VZ3OqQKO7vi+SQ5m0jqlrjNniNZ43n9WheHyLrIPauy3S2yS6qFpGWavhmhyiAZC1okMzb7+NYNDulqvFItL/7kQMTzDvgIoXOaKgVj3hKQKPJwPDwd5qjlJvIQY6uMhqeDHe/9BsOnZM1ptBg62pC0lc2t5Q/RjfvXkFv9J1oPh9/xWCc6C1e+sboVp0qWsaFAURlv5bzV/FP0Bt0nTMoEBvk3K1PfC3esv+t9sxIAQ0A5Nzn2vSzxfMLqZ+wzEPquP3Dff2Svj64tQXOw== 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=SvXyO1FAoUKbeW4VhM1H2RCETNXJqwNztp/2tQfyuq8=; b=d1JKO6Ulus+FnCRx9n9oxLzdkq7oOcine6keMnz++WKOao0e+a6sQG6+ztUDXMNrfeZr7/3fageQQ5d22/tTqNSevKmK39N3uJlIc5SUU3q/WpWZ9NkH9zyMv9iqB12zdUkZAO5DpZmawu6pOaIAYJFV43AHoIiCmU6SdYK4JV5speDqaAbQI8AZN7vlwlBYVkXOItG7r1Lw4EkGR341TpvOBzCDoXJvvswu3QmxIeAt653ORuNnFhTQZplqiTtR1ralyCe04jMOeMay8duAC1aAHvF8+a9+MXdpmGWfkLgIIIbI7qslfsU11MonkZFuOLEgR80hh0HxZfyLKkHlYQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.233) 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 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=SvXyO1FAoUKbeW4VhM1H2RCETNXJqwNztp/2tQfyuq8=; b=ReIhNUGSnzdojg7vvHoA9hlo+00Q15kzCtkCDEmXXHR39iwfV6r4lb8JldMvXT7rqSYKHcl4H8Z4Mv5y7/xOGvNUew29lNbzJ5QrOfV3ifA+YRrgh4gbWlS8ViikOoC8wPFMdCmPZ47tk9+WSgkectBOPe2oNbPtqQnDoiSxPlXMcpkgBXICyOUY4BFTXbqWMSXihZYUjQ11g3Wr5uvoVT/JZlCheMTxJm1C/3oNFM6DqmW9daC9lVhveduO7NtC2J3NUO3KfeUy+YWgj6SGxNz9JMsF9LZDx0VjpaGJcOGvE3ToJQLuvDMGj3jUegtq6ihKYNBJCbrz7fGWifaDJw== Received: from DM6PR06CA0012.namprd06.prod.outlook.com (2603:10b6:5:120::25) by DS0PR12MB7777.namprd12.prod.outlook.com (2603:10b6:8:153::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.34; Mon, 6 Feb 2023 17:44:20 +0000 Received: from DM6NAM11FT038.eop-nam11.prod.protection.outlook.com (2603:10b6:5:120:cafe::c9) by DM6PR06CA0012.outlook.office365.com (2603:10b6:5:120::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.35 via Frontend Transport; Mon, 6 Feb 2023 17:44:20 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.233) 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.118.233 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.233; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.233) by DM6NAM11FT038.mail.protection.outlook.com (10.13.173.137) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.32 via Frontend Transport; Mon, 6 Feb 2023 17:44:20 +0000 Received: from drhqmail203.nvidia.com (10.126.190.182) by mail.nvidia.com (10.127.129.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Mon, 6 Feb 2023 09:44:16 -0800 Received: from drhqmail201.nvidia.com (10.126.190.180) by drhqmail203.nvidia.com (10.126.190.182) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Mon, 6 Feb 2023 09:44:16 -0800 Received: from reg-r-vrt-019-180.mtr.labs.mlnx (10.127.8.11) by mail.nvidia.com (10.126.190.180) with Microsoft SMTP Server id 15.2.986.36 via Frontend Transport; Mon, 6 Feb 2023 09:44:13 -0800 From: Paul Blakey To: Paul Blakey , , Saeed Mahameed , Paolo Abeni , Jakub Kicinski , Eric Dumazet , Jamal Hadi Salim , Cong Wang , "David S. Miller" CC: Oz Shlomo , Jiri Pirko , Roi Dayan , Vlad Buslov , Simon Horman Subject: [PATCH net-next v9 2/7] net/sched: flower: Move filter handle initialization earlier Date: Mon, 6 Feb 2023 19:43:58 +0200 Message-ID: <20230206174403.32733-3-paulb@nvidia.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20230206174403.32733-1-paulb@nvidia.com> References: <20230206174403.32733-1-paulb@nvidia.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT038:EE_|DS0PR12MB7777:EE_ X-MS-Office365-Filtering-Correlation-Id: 2753f605-0689-44b2-ed29-08db0869c724 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UjpDKc9BJdM0P01fgzU3lcX4bAJPGY8mD/SlR2dCLCsR93TXxzUJb+PFqiuGKK5Wom9ZRGKaQRD5OJAAeMH8vAG6PVL5eTp4h1mkIxGGztE5rIe2+7Hbpg6icDkWtay+1J8EPCsigLFnronAapw2zEW71Muo5EDZhuA+g2/9Fz0Mxtw3k/FxsKyPB/9AeB1rDEB6kw0oYXdNrMRDWU2QWxt8EPuTAyrkbogeSiCnB7QMoqL5xJBfTmYBJ9fouDuWOKGlUuAMdFqp83GPvd6fP3nUCiFvmwOrGG3PHhCpGfCDJQSotgkGmG9X5+QeltZ/znPZeRLzmOKh6w0ft87AmK2qf0Z9FIl3BUenvLdhzq1aim44T/jLAvL6rNYR6grYjYr4q4vqzKJJ72BX3m45PfYlTfmvGQf7YB75Z8RyypJxPPd5QgybEQqomyHlkq69frOxr0sjjKH6LeUNVCyYPdN5d2z2DvaA2JsCZg1W1JrplStb9PUcpjQXw6JzZa9ksuITq7/nbxqF/6P4JfQxHBbkuQYBVsWcTk4UQCvWWGEw2DsAgkwq3Yufb5+CbPp5V1c6PoluMNtrTjXLTix0UsmuhUb7Rsva67c1t0eipfCaT1M1pN7yiI5moq++jhBZLM+Hvsw1SnGWQLu9sxwMEEj4NHG8UwH1k2A8No/WGFICD+jE3vWwQezUQUw+NyIMs8FV83V6P75kax5QZv0agQ== X-Forefront-Antispam-Report: CIP:216.228.118.233;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc7edge2.nvidia.com;CAT:NONE;SFS:(13230025)(4636009)(136003)(39860400002)(346002)(376002)(396003)(451199018)(46966006)(36840700001)(40470700004)(82310400005)(40460700003)(6666004)(1076003)(40480700001)(2616005)(478600001)(186003)(8676002)(26005)(4326008)(70586007)(70206006)(316002)(110136005)(54906003)(36756003)(82740400003)(356005)(7636003)(86362001)(426003)(47076005)(83380400001)(36860700001)(336012)(5660300002)(41300700001)(8936002)(2906002);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Feb 2023 17:44:20.7325 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2753f605-0689-44b2-ed29-08db0869c724 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.118.233];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT038.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB7777 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org 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 --- 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 0b15698b3531..564b862870c7 100644 --- a/net/sched/cls_flower.c +++ b/net/sched/cls_flower.c @@ -2192,10 +2192,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]); @@ -2205,15 +2201,45 @@ 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], tp->chain->tmplt_priv, flags, fnew->flags, 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) @@ -2279,29 +2305,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); } @@ -2324,6 +2330,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: