From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 311F2C43381 for ; Mon, 18 Feb 2019 09:36:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D3044218AD for ; Mon, 18 Feb 2019 09:36:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=Mellanox.com header.i=@Mellanox.com header.b="nP/mOeVF" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728968AbfBRJgB (ORCPT ); Mon, 18 Feb 2019 04:36:01 -0500 Received: from mail-eopbgr140070.outbound.protection.outlook.com ([40.107.14.70]:9310 "EHLO EUR01-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727228AbfBRJgB (ORCPT ); Mon, 18 Feb 2019 04:36:01 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=j2bNGTw37LmIQVi0CsuEtKt7msD5E1ZuT+OwZMkHQLs=; b=nP/mOeVFr1G1n1M4RCrJntirDPstgDBxMNJCEDje9ENr9mcDWbS6qA1K2vXOiti+3oHqxN4BSP4Gbf52sttKeSj37j2Jh7s8fRLUcKENUiEMEhTghi4+hqR5KVq4K3la57sqq2pVoNR3a8idh9MDx9Sj+QVl+P4M20ZGawUCXvk= Received: from HE1PR0502MB3641.eurprd05.prod.outlook.com (10.167.127.11) by HE1PR0502MB2940.eurprd05.prod.outlook.com (10.175.35.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1622.16; Mon, 18 Feb 2019 09:35:56 +0000 Received: from HE1PR0502MB3641.eurprd05.prod.outlook.com ([fe80::4041:bb68:2af3:eab8]) by HE1PR0502MB3641.eurprd05.prod.outlook.com ([fe80::4041:bb68:2af3:eab8%5]) with mapi id 15.20.1622.018; Mon, 18 Feb 2019 09:35:56 +0000 From: Vlad Buslov To: Stefano Brivio CC: "netdev@vger.kernel.org" , "jhs@mojatatu.com" , "xiyou.wangcong@gmail.com" , "jiri@resnulli.us" , "davem@davemloft.net" Subject: Re: [PATCH net-next 11/12] net: sched: flower: track rtnl lock state Thread-Topic: [PATCH net-next 11/12] net: sched: flower: track rtnl lock state Thread-Index: AQHUxDmhW+FEhwlKcEiI0AFK6zQszaXheESAgAPZ9IA= Date: Mon, 18 Feb 2019 09:35:55 +0000 Message-ID: References: <20190214074712.17846-1-vladbu@mellanox.com> <20190214074712.17846-12-vladbu@mellanox.com> <20190215234659.3630ad3c@redhat.com> In-Reply-To: <20190215234659.3630ad3c@redhat.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: LO2P265CA0259.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:8a::31) To HE1PR0502MB3641.eurprd05.prod.outlook.com (2603:10a6:7:85::11) authentication-results: spf=none (sender IP is ) smtp.mailfrom=vladbu@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [37.142.13.130] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: a7e19286-4f18-4653-0f6e-08d695847b43 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605104)(4618075)(2017052603328)(7153060)(7193020);SRVR:HE1PR0502MB2940; x-ms-traffictypediagnostic: HE1PR0502MB2940: x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1;HE1PR0502MB2940;23:mxXmZAzkCQkQL0hFuH1J5s4U2uZMNcANUFMLF?= =?iso-8859-1?Q?LNnvnV05W+ADNktQK1KUjyc9+WQ+ciorWpEUvscL6Z1rdBfsgJWCJlMUf0?= =?iso-8859-1?Q?hU+Z2keMdBfqYvpVS23F4u+/w1MYGuF3XbYM41CKtx6Pka7r4vzeKf7km4?= =?iso-8859-1?Q?T4WnC4GFDhlM2eSYV1ckfcjD3F3hQ2oyp/vl7/UgTSVIOocYtm6AcXdP2n?= =?iso-8859-1?Q?dkO8pwRtttDfzFqc5Vhe0RfTxeYKmM+1wO1aue63GyxeAesJvfZhDAWtcq?= =?iso-8859-1?Q?zObbbRSToqqFywOSzmc2t7nXfs18tgwLcB4MizcYr5xznopd5TV2V//Ppo?= =?iso-8859-1?Q?BZY62Ineae7AdPUOOpHmjFuCFUrSSwqFgr8H5RyyLpfjr9HMJkin3Kxre8?= =?iso-8859-1?Q?PUDHobHW7PH0MTYCEt9NQ881jEs9ts91jZ2UW2yObY+/inzxanFUwpB+KU?= =?iso-8859-1?Q?gGf+Kw0MCVSCARrDx9MV3P4s6LlpO5P9LBa4TF3UtSzKQjrh9KW481LYsE?= =?iso-8859-1?Q?NqoI/GPz/5inWjFrWUDOp3vzSv3tUvxkMh+NOkGXEjROXy6QgGYw44/ADx?= =?iso-8859-1?Q?mePrSA+iS2YG6b8sBLLNDDk2kzPlC0MOeuu9AKf7yf4SX5JvnrU8FOsyj3?= =?iso-8859-1?Q?YbgAk/tTU/tioV5c2mXDsARoukrLYqIcyaMTYP3ZJ8A+DwOG+RWMCeWY+q?= =?iso-8859-1?Q?1oUpYyRSb+CE+c/mmOscUBw8HD2CLlR8s3vTNKYa7kyH3t3Ij4vTIh7nuE?= =?iso-8859-1?Q?MFkFGNBP5b8fZqpufNTpp4QR/kxx6/wVEBLgz89MXVDpjrslmk/Yra5Q/R?= =?iso-8859-1?Q?apLjzlHs2OGBV2ZSAWVPX3rDnbdL8axXFvnvHvPjhDfJSyrOFBA5y98rqg?= =?iso-8859-1?Q?+8pCmDZZSuAmaTwG2iS0CQNTZmWgSmC/XP54qh2YSUliCPrG63sfZac5lo?= =?iso-8859-1?Q?ACdg1YaNfp16fEezbFDWBLods1u2qTImaNVaBG7IOK7v4pd5LKsEBfZqhW?= =?iso-8859-1?Q?2ZwYL3yw3IvWlzdD4mV1UaM6tfJGLiNhcglK3leVTEy/ClzkJ/DyGEmXX8?= =?iso-8859-1?Q?AkLfD509ksBgWjDk0XGaA/c3sw/lnQ8Rd0NJiR3J0TSHf6KF0FnbN2WpyL?= =?iso-8859-1?Q?OG+oQfewGkMeinEoj7wPwf8SntdmgC/cgdY1Q92aufsZtUSglq3VjVt5jV?= =?iso-8859-1?Q?LE7bZwI9skA/RQ0KVfmtIJ4WUiNI24wBhSA7S3wBQDr4Ov8kytl3je891F?= =?iso-8859-1?Q?28RxRYUr1HUK1/mWB6cPAZ4qCOUJ+WIR5VXMPuH1g=3D=3D?= x-microsoft-antispam-prvs: x-forefront-prvs: 09525C61DB x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(136003)(346002)(376002)(39860400002)(366004)(396003)(189003)(199004)(105586002)(99286004)(76176011)(106356001)(52116002)(86362001)(2906002)(6512007)(66066001)(305945005)(6916009)(68736007)(5660300002)(81166006)(8936002)(97736004)(6436002)(7736002)(229853002)(6486002)(71190400001)(71200400001)(478600001)(8676002)(6246003)(102836004)(256004)(14444005)(386003)(6506007)(53936002)(81156014)(26005)(476003)(3846002)(2616005)(486006)(6116002)(4326008)(54906003)(25786009)(186003)(316002)(36756003)(11346002)(446003)(14454004);DIR:OUT;SFP:1101;SCL:1;SRVR:HE1PR0502MB2940;H:HE1PR0502MB3641.eurprd05.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: GJfK0gKQ//sbt1Yi2IA2BeEq4nR5ujPsiFAN1k6+PqXMYII7sILSN1rkxqI3y8QJkKhigf6hSeUD1MXNwG/4Vc9yKPpaLefEKhD1eHqiqnxGsFFwDPJB8MwlLBeCnr4GLQxS25IGq1ZrU+j2GgfsBrG1iw55FZneguClnUXDmKwtnH7M0ZKST4TTJBFUj6PiSUFNaUOFe6OPcgONmOJoRdAFalw7gzJaGgswYINqsfKeSWomu1lorUnhIkEACRFlsnqVkj1sxKBr7fePuQfBZ2JY7P3EnLYBcIy3atsibAmeSZzTc5mX/C+K7TZd1oc47tTqSrwrcMTr7pq4etaRgyvR4jWL1Tk465pRZjjO1tQAXUMs0HPLxSxJycxo2N+lJCNE7a26OiTK2frsPYR/dLHiOgcPopVWifxGD/YdPEk= Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: a7e19286-4f18-4653-0f6e-08d695847b43 X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Feb 2019 09:35:54.7302 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0502MB2940 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Fri 15 Feb 2019 at 22:46, Stefano Brivio wrote: > On Thu, 14 Feb 2019 09:47:11 +0200 > Vlad Buslov wrote: > >> static int fl_hw_replace_filter(struct tcf_proto *tp, >> - struct cls_fl_filter *f, >> + struct cls_fl_filter *f, bool rtnl_held, >> struct netlink_ext_ack *extack) >> { >> struct tc_cls_flower_offload cls_flower =3D {}; >> struct tcf_block *block =3D tp->chain->block; >> bool skip_sw =3D tc_skip_sw(f->flags); >> - int err; >> + int err =3D 0; >> + >> + if (!rtnl_held) >> + rtnl_lock(); >> =20 >> cls_flower.rule =3D flow_rule_alloc(tcf_exts_num_actions(&f->exts)); >> if (!cls_flower.rule) > > return -ENOMEM; > > Don't you need to: > > err =3D -ENOMEM; > goto errout; > > here? > > Same... > > err =3D tc_setup_flow_action(&cls_flower.rule->action, &f->exts); > if (err) { > kfree(cls_flower.rule); > if (skip_sw) { > NL_SET_ERR_MSG_MOD(extack, "Failed to setup flow = action"); > return err; > > here, > > } > return 0; > > and here. Thanks for catching this! These error handlers were introduced by recent Pablo's patches and I missed them during rebase.