From patchwork Mon Jan 28 12:02:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 1031880 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b="IWIVGRqi"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43p7Xl2xPXz9s3q for ; Mon, 28 Jan 2019 23:02:15 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726779AbfA1MCO (ORCPT ); Mon, 28 Jan 2019 07:02:14 -0500 Received: from mail-eopbgr30068.outbound.protection.outlook.com ([40.107.3.68]:30567 "EHLO EUR03-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726668AbfA1MCN (ORCPT ); Mon, 28 Jan 2019 07:02:13 -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=JIvAnsHPfEEoSo3B1zY/hdotEqlMXA8+TMkI8dPlVjE=; b=IWIVGRqiS6DSnbfQjS5OEbCg4/r3NxZGeIJZQyXMJJ7gdMcvPzvHunFbjPx7x+6Mc03sIqi/SI12ZNEg3Ze4U/sNC3T7abf2z+5Cr5YWGCROSxBIWacnY/1knmfSYVi9G9EhN9DP8nh1/4TsNfzjjrTkXM4ywJTvUyk1qEqCVG0= Received: from DB7PR05MB4940.eurprd05.prod.outlook.com (20.176.235.152) by DB7PR05MB4250.eurprd05.prod.outlook.com (52.134.108.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.21; Mon, 28 Jan 2019 12:02:07 +0000 Received: from DB7PR05MB4940.eurprd05.prod.outlook.com ([fe80::6161:97fd:d315:7b07]) by DB7PR05MB4940.eurprd05.prod.outlook.com ([fe80::6161:97fd:d315:7b07%6]) with mapi id 15.20.1558.023; Mon, 28 Jan 2019 12:02:07 +0000 From: Ido Schimmel To: "netdev@vger.kernel.org" CC: "davem@davemloft.net" , Jiri Pirko , mlxsw , Ido Schimmel Subject: [PATCH net-next 1/7] mlxsw: spectrum_acl: Remove unnecessary arg on action_replace call path Thread-Topic: [PATCH net-next 1/7] mlxsw: spectrum_acl: Remove unnecessary arg on action_replace call path Thread-Index: AQHUtwFKgWDLdw7b9ES25dJzxi7z/w== Date: Mon, 28 Jan 2019 12:02:07 +0000 Message-ID: <20190128120131.2848-2-idosch@mellanox.com> References: <20190128120131.2848-1-idosch@mellanox.com> In-Reply-To: <20190128120131.2848-1-idosch@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6P194CA0090.EURP194.PROD.OUTLOOK.COM (2603:10a6:209:8f::31) To DB7PR05MB4940.eurprd05.prod.outlook.com (2603:10a6:10:1e::24) authentication-results: spf=none (sender IP is ) smtp.mailfrom=idosch@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.20.1 x-originating-ip: [193.47.165.251] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DB7PR05MB4250; 6:3+ak4xxn5ImzgR8T+zvsSEc4oDpmrp9jAzxTh89/PnCOtaQZ2oqnpLAiunqm7IJYNyu0ZTdySyteU67CnyZ0vgbbYlNAxESXIN3xTJu3pTGG9O6zDDw+07CnCi8V2TDYQxwpAo5zQIYowMZubgaucYnIA0IdfuFYlOGA5NfOrZh1aY3u+308gDzumtUx9gmy2EoPkxAkY4CtwLBE6vLfYnqlM7EV5E1DMLseOh+Se3QCyVhb0YQ4nCvPAFNk9G4LO7BP6NiDwrlFTyHziiBk6VUza2v4D8iDDYkpvyiHQiXCopjgnrevDGsNYgI7jK1/Hjx+geoHl/5mpxk+LgUw71Wpg7tlssJxQJMLkw34qB5MS5QjlwhIlm0YxJegrjwHW2y2wZZ6i0dJdAjwwUqtrYV8x40ne7/q4h/uwW6hzOTs6kWNCXk9wdXPrXzSbs9CQhfFOxttQXDUhYRF74YhgQ==; 5:s/nSte4GZnz8XBZSiuL+esEPClw+NS7w4SgivFviOuVm3gWK6TqBsCt2ReW40hG8m0EEjAa9XkG2S1MIiBYUhd5Fjn4YdxNRwwtxP7TJ1OL+mq6iVXaEQ8GRZ4X0yA0SDuxxyRnyDFOFpm2bd2E/5Anas7sfipzaltMt1ih7/iOwIt2qnAyaH16tOiL3fwi5uwx+NbIeNOm4+6BVrrGx1A==; 7:C7kV1jRlHUDMiG1TpNSQL/adxSYem6d+MHRar7OkDsUeTSZ2MoZ3snFqQP8ajR/MirzjEHnlzuZSKCeBAqVzQucqzGCDovbnPlfAalpIoQdoWQ/cP+Isb9eomZqM1NBpowp085eQubafiaK4V9C/fA== x-ms-office365-filtering-correlation-id: 8ac73e4a-5f55-48f9-1db5-08d685186cca 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)(4605077)(4618075)(2017052603328)(7153060)(7193020); SRVR:DB7PR05MB4250; x-ms-traffictypediagnostic: DB7PR05MB4250: x-microsoft-antispam-prvs: x-forefront-prvs: 0931CB1479 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(346002)(396003)(376002)(136003)(39860400002)(366004)(199004)(189003)(446003)(11346002)(54906003)(478600001)(6916009)(36756003)(305945005)(256004)(86362001)(81156014)(8676002)(6506007)(14454004)(486006)(2616005)(1730700003)(68736007)(105586002)(386003)(52116002)(102836004)(2351001)(476003)(106356001)(7736002)(76176011)(316002)(99286004)(186003)(53936002)(107886003)(25786009)(26005)(4326008)(81166006)(6486002)(6116002)(3846002)(2501003)(8936002)(97736004)(1076003)(6512007)(5640700003)(2906002)(6436002)(71200400001)(66066001)(71190400001)(50226002); DIR:OUT; SFP:1101; SCL:1; SRVR:DB7PR05MB4250; H:DB7PR05MB4940.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX: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: nH8ryJ/ZN8wznkS4bjqyB5SG4X+d/3LIPZ+xlNnsekWArP+GhYzgY5+rr8j5KpTOOBovQ5clq8Qj9EWQVTUNZcEbN0zvWk477ccCULViySFc8m01M9/h8jF2DYe2LzDjCAALU5MLpOSun8MLjkIAVA9aCn2a6xL9hi1aEwHRVaVJSS6JQO3baiPPMBRPc8fdKoYIPBftbEWz0SpxtVTBTxEK2mMqtFIavrAlze0QHMJEF3O4+eIly8ee7QQrWoKf/FCThe6rSjw7ife16RtK5RtOUExC0hSau+A6nOqp6lWkFmsr7nSrB5lCjLThk6XYiirOfUOk+9RxL5Ey0J01xi0l8JkIWNTDRBnFznIO7eVDqaGLIh73KB4KJgMctvNWfIYlhP4UvBAs4+NUmdnjTboLdyu65DLx3aidD4Y3JM4= MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8ac73e4a-5f55-48f9-1db5-08d685186cca X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2019 12:02:06.4654 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR05MB4250 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jiri Pirko No need to pass ruleset/group and chunk pointers on action_replace call path, nobody uses them. Signed-off-by: Jiri Pirko Signed-off-by: Ido Schimmel --- drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 3 +-- .../net/ethernet/mellanox/mlxsw/spectrum1_acl_tcam.c | 3 +-- .../net/ethernet/mellanox/mlxsw/spectrum2_acl_tcam.c | 5 +---- drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c | 3 +-- .../net/ethernet/mellanox/mlxsw/spectrum_acl_atcam.c | 2 -- .../net/ethernet/mellanox/mlxsw/spectrum_acl_ctcam.c | 1 - .../net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c | 11 ++++------- .../net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.h | 5 +---- 8 files changed, 9 insertions(+), 24 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h index 9384b108c8c2..4fe0996c7cdd 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h @@ -721,8 +721,7 @@ struct mlxsw_sp_acl_tcam_ops { void *region_priv, void *chunk_priv, void *entry_priv); int (*entry_action_replace)(struct mlxsw_sp *mlxsw_sp, - void *region_priv, void *chunk_priv, - void *entry_priv, + void *region_priv, void *entry_priv, struct mlxsw_sp_acl_rule_info *rulei); int (*entry_activity_get)(struct mlxsw_sp *mlxsw_sp, void *region_priv, void *entry_priv, diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum1_acl_tcam.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum1_acl_tcam.c index fe270c1a26a6..6e444525713f 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum1_acl_tcam.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum1_acl_tcam.c @@ -194,8 +194,7 @@ static void mlxsw_sp1_acl_tcam_entry_del(struct mlxsw_sp *mlxsw_sp, static int mlxsw_sp1_acl_tcam_entry_action_replace(struct mlxsw_sp *mlxsw_sp, - void *region_priv, void *chunk_priv, - void *entry_priv, + void *region_priv, void *entry_priv, struct mlxsw_sp_acl_rule_info *rulei) { return -EOPNOTSUPP; diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum2_acl_tcam.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum2_acl_tcam.c index 234ab51916db..d380b3403960 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum2_acl_tcam.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum2_acl_tcam.c @@ -212,18 +212,15 @@ static void mlxsw_sp2_acl_tcam_entry_del(struct mlxsw_sp *mlxsw_sp, static int mlxsw_sp2_acl_tcam_entry_action_replace(struct mlxsw_sp *mlxsw_sp, - void *region_priv, void *chunk_priv, - void *entry_priv, + void *region_priv, void *entry_priv, struct mlxsw_sp_acl_rule_info *rulei) { struct mlxsw_sp2_acl_tcam_region *region = region_priv; - struct mlxsw_sp2_acl_tcam_chunk *chunk = chunk_priv; struct mlxsw_sp2_acl_tcam_entry *entry = entry_priv; entry->act_block = rulei->act_block; return mlxsw_sp_acl_atcam_entry_action_replace(mlxsw_sp, ®ion->aregion, - &chunk->achunk, &entry->aentry, rulei); } diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c index 695d33358988..bd40ed065f3e 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c @@ -742,8 +742,7 @@ int mlxsw_sp_acl_rule_action_replace(struct mlxsw_sp *mlxsw_sp, rulei = mlxsw_sp_acl_rule_rulei(rule); rulei->act_block = afa_block; - return ops->rule_action_replace(mlxsw_sp, ruleset->priv, rule->priv, - rule->rulei); + return ops->rule_action_replace(mlxsw_sp, rule->priv, rule->rulei); } struct mlxsw_sp_acl_rule * diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_atcam.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_atcam.c index 80fb268d51a5..40dc76a5c412 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_atcam.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_atcam.c @@ -603,7 +603,6 @@ void mlxsw_sp_acl_atcam_entry_del(struct mlxsw_sp *mlxsw_sp, int mlxsw_sp_acl_atcam_entry_action_replace(struct mlxsw_sp *mlxsw_sp, struct mlxsw_sp_acl_atcam_region *aregion, - struct mlxsw_sp_acl_atcam_chunk *achunk, struct mlxsw_sp_acl_atcam_entry *aentry, struct mlxsw_sp_acl_rule_info *rulei) { @@ -612,7 +611,6 @@ mlxsw_sp_acl_atcam_entry_action_replace(struct mlxsw_sp *mlxsw_sp, if (mlxsw_sp_acl_atcam_is_centry(aentry)) err = mlxsw_sp_acl_ctcam_entry_action_replace(mlxsw_sp, &aregion->cregion, - &achunk->cchunk, &aentry->centry, rulei); else diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_ctcam.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_ctcam.c index ac222833a5cf..05680a7e6c56 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_ctcam.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_ctcam.c @@ -223,7 +223,6 @@ void mlxsw_sp_acl_ctcam_entry_del(struct mlxsw_sp *mlxsw_sp, int mlxsw_sp_acl_ctcam_entry_action_replace(struct mlxsw_sp *mlxsw_sp, struct mlxsw_sp_acl_ctcam_region *cregion, - struct mlxsw_sp_acl_ctcam_chunk *cchunk, struct mlxsw_sp_acl_ctcam_entry *centry, struct mlxsw_sp_acl_rule_info *rulei) { diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c index fe230acf92a9..5d29c5050401 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c @@ -781,7 +781,6 @@ static void mlxsw_sp_acl_tcam_entry_del(struct mlxsw_sp *mlxsw_sp, static int mlxsw_sp_acl_tcam_entry_action_replace(struct mlxsw_sp *mlxsw_sp, - struct mlxsw_sp_acl_tcam_group *group, struct mlxsw_sp_acl_tcam_entry *entry, struct mlxsw_sp_acl_rule_info *rulei) { @@ -789,7 +788,7 @@ mlxsw_sp_acl_tcam_entry_action_replace(struct mlxsw_sp *mlxsw_sp, struct mlxsw_sp_acl_tcam_chunk *chunk = entry->chunk; struct mlxsw_sp_acl_tcam_region *region = chunk->region; - return ops->entry_action_replace(mlxsw_sp, region->priv, chunk->priv, + return ops->entry_action_replace(mlxsw_sp, region->priv, entry->priv, rulei); } @@ -955,7 +954,6 @@ mlxsw_sp_acl_tcam_flower_rule_del(struct mlxsw_sp *mlxsw_sp, void *rule_priv) static int mlxsw_sp_acl_tcam_flower_rule_action_replace(struct mlxsw_sp *mlxsw_sp, - void *ruleset_priv, void *rule_priv, struct mlxsw_sp_acl_rule_info *rulei) { @@ -1084,14 +1082,13 @@ mlxsw_sp_acl_tcam_mr_rule_del(struct mlxsw_sp *mlxsw_sp, void *rule_priv) static int mlxsw_sp_acl_tcam_mr_rule_action_replace(struct mlxsw_sp *mlxsw_sp, - void *ruleset_priv, void *rule_priv, + void *rule_priv, struct mlxsw_sp_acl_rule_info *rulei) { - struct mlxsw_sp_acl_tcam_mr_ruleset *ruleset = ruleset_priv; struct mlxsw_sp_acl_tcam_mr_rule *rule = rule_priv; - return mlxsw_sp_acl_tcam_entry_action_replace(mlxsw_sp, &ruleset->group, - &rule->entry, rulei); + return mlxsw_sp_acl_tcam_entry_action_replace(mlxsw_sp, &rule->entry, + rulei); } static int diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.h index 0f1a9dee63de..10512b7c6d50 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.h +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.h @@ -48,8 +48,7 @@ struct mlxsw_sp_acl_profile_ops { void *ruleset_priv, void *rule_priv, struct mlxsw_sp_acl_rule_info *rulei); void (*rule_del)(struct mlxsw_sp *mlxsw_sp, void *rule_priv); - int (*rule_action_replace)(struct mlxsw_sp *mlxsw_sp, - void *ruleset_priv, void *rule_priv, + int (*rule_action_replace)(struct mlxsw_sp *mlxsw_sp, void *rule_priv, struct mlxsw_sp_acl_rule_info *rulei); int (*rule_activity_get)(struct mlxsw_sp *mlxsw_sp, void *rule_priv, bool *activity); @@ -126,7 +125,6 @@ void mlxsw_sp_acl_ctcam_entry_del(struct mlxsw_sp *mlxsw_sp, struct mlxsw_sp_acl_ctcam_entry *centry); int mlxsw_sp_acl_ctcam_entry_action_replace(struct mlxsw_sp *mlxsw_sp, struct mlxsw_sp_acl_ctcam_region *cregion, - struct mlxsw_sp_acl_ctcam_chunk *cchunk, struct mlxsw_sp_acl_ctcam_entry *centry, struct mlxsw_sp_acl_rule_info *rulei); static inline unsigned int @@ -224,7 +222,6 @@ void mlxsw_sp_acl_atcam_entry_del(struct mlxsw_sp *mlxsw_sp, struct mlxsw_sp_acl_atcam_entry *aentry); int mlxsw_sp_acl_atcam_entry_action_replace(struct mlxsw_sp *mlxsw_sp, struct mlxsw_sp_acl_atcam_region *aregion, - struct mlxsw_sp_acl_atcam_chunk *achunk, struct mlxsw_sp_acl_atcam_entry *aentry, struct mlxsw_sp_acl_rule_info *rulei); int mlxsw_sp_acl_atcam_init(struct mlxsw_sp *mlxsw_sp, From patchwork Mon Jan 28 12:02:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 1031881 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b="K5RicYxj"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43p7Xn3B0rz9s3q for ; Mon, 28 Jan 2019 23:02:17 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726846AbfA1MCQ (ORCPT ); Mon, 28 Jan 2019 07:02:16 -0500 Received: from mail-eopbgr30068.outbound.protection.outlook.com ([40.107.3.68]:30567 "EHLO EUR03-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726752AbfA1MCO (ORCPT ); Mon, 28 Jan 2019 07:02:14 -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=FtDiFC0o848io9ZRs0MFcAXT0si0lF5VtP/5afP4Ybo=; b=K5RicYxjapgKKeD+wRHHz0RP6+/Y8BQ2RYeSkLvZ/nW6kWinkHYnV+WuHyT2m5QfFjrpV/vHBeMZIdo2547NtEBvWg9XmEpcztxYun0N9eErF01vsPO7pYAoWNlAauJ0OEHHLWFypEudJyeaqC3kkgWjyJTvtcxySJ72zbzx4e4= Received: from DB7PR05MB4940.eurprd05.prod.outlook.com (20.176.235.152) by DB7PR05MB4250.eurprd05.prod.outlook.com (52.134.108.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.21; Mon, 28 Jan 2019 12:02:08 +0000 Received: from DB7PR05MB4940.eurprd05.prod.outlook.com ([fe80::6161:97fd:d315:7b07]) by DB7PR05MB4940.eurprd05.prod.outlook.com ([fe80::6161:97fd:d315:7b07%6]) with mapi id 15.20.1558.023; Mon, 28 Jan 2019 12:02:08 +0000 From: Ido Schimmel To: "netdev@vger.kernel.org" CC: "davem@davemloft.net" , Jiri Pirko , mlxsw , Ido Schimmel Subject: [PATCH net-next 2/7] mlxsw: spectrum_acl: Move mr_ruleset and mr_rule structs Thread-Topic: [PATCH net-next 2/7] mlxsw: spectrum_acl: Move mr_ruleset and mr_rule structs Thread-Index: AQHUtwFLv43I76M3bEKTU8Wrp6lydA== Date: Mon, 28 Jan 2019 12:02:08 +0000 Message-ID: <20190128120131.2848-3-idosch@mellanox.com> References: <20190128120131.2848-1-idosch@mellanox.com> In-Reply-To: <20190128120131.2848-1-idosch@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6P194CA0090.EURP194.PROD.OUTLOOK.COM (2603:10a6:209:8f::31) To DB7PR05MB4940.eurprd05.prod.outlook.com (2603:10a6:10:1e::24) authentication-results: spf=none (sender IP is ) smtp.mailfrom=idosch@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.20.1 x-originating-ip: [193.47.165.251] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DB7PR05MB4250; 6:VbMs+y0omKPI+9D7pIN/qQCBdkBNVqWQGhccOk0c9oaES+o9evE6xLU0VYrOwdjcMx7AO9C2EV5T3v1BNkcT9DL41kW+64q9OQPqrC2PxY8kzWpJcSWTUhbHdAmu9nzxznxXg/z+jHigMI52JjG1LfG7XB4uS+QMsjj3Nim05DP8WQiX6wbMSwlm1quMPklV6Nkzj4HRtZRtYuOmKlZX3tpZcmA37ELbMB7iXQ0a63+QB77Fkrb5coPXbD0bE44whSKLwPuAM4RBYFsj3ivSisdkcUuhad7E10zUNmh8T0pfy9ep5WdPsNhtfnxO9M+32Bs0Q26DWXrTWrWhSzX1/ONG0tD82VB0F9NlxHtDcAekjATY5Kuj/bnKrLj9hUjV7tVc0UzZFDLYxuBkHW22iA/bYfUld1bVVJ1HAmgLWic23fenaInButyw/duRaOvtIRxFwSCUieV08FHYdmGZUw==; 5:oXf0vSw6OEUYaVw3FaQKns9c/ZMwQklobgZ8uP5kK2yTc61XMh+4Vuf8XTH5fg8G0qdREHX2+MVaW6+fVd5VQLuwx0wycLsQFlJpwRkd4NBHDvXmOW32UfHeKVn83Sd0UaSLDTe9seCDpadZKJzRhTusfDQFV0GNy77/bt8IZWQb2LLAwwWhLyhtkPp73Lr3gWInA9UJypW8XwyydL3b7w==; 7:b5rBz4gjpfQXl83bmpOM51f1XtgcVde3NM8eex9E06ZY8dU0ivocKaSeHcRJDHS3Q6i5hrAltXkWnCiIhSuUaGB3dS1pHTSGGiUV2NLRY0EDkBUJV4yhRPfbLMM6P8kv9XkyevT6oRpKSHW8D4OpWA== x-ms-office365-filtering-correlation-id: e13614b1-dbef-4814-49ac-08d685186d75 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)(4605077)(4618075)(2017052603328)(7153060)(7193020); SRVR:DB7PR05MB4250; x-ms-traffictypediagnostic: DB7PR05MB4250: x-microsoft-antispam-prvs: x-forefront-prvs: 0931CB1479 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(346002)(396003)(376002)(136003)(39860400002)(366004)(199004)(189003)(446003)(11346002)(54906003)(478600001)(6916009)(36756003)(305945005)(256004)(86362001)(81156014)(8676002)(6506007)(14454004)(486006)(2616005)(1730700003)(68736007)(105586002)(386003)(52116002)(102836004)(2351001)(476003)(106356001)(7736002)(76176011)(316002)(99286004)(186003)(53936002)(107886003)(25786009)(26005)(4326008)(81166006)(6486002)(6116002)(3846002)(2501003)(8936002)(97736004)(1076003)(6512007)(5640700003)(2906002)(6436002)(71200400001)(66066001)(71190400001)(50226002); DIR:OUT; SFP:1101; SCL:1; SRVR:DB7PR05MB4250; H:DB7PR05MB4940.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX: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: qjoZ6wofbPoQABe6c+mOCJ9l3ZB2Psh53aHby9wy7oRduvR7NMyiO8npp2h2irqg+V1qbaA2rwGCxJpuYk/6FMwhuKIEMF8FBilyfF0sgkTupfMmO5nDTQ4bEPig+dEr2Y7SJ/hwsCeRxWBj6Oknk0dnJ6ntRi0ZdxBPlAfuxeiunn8JFV3omq9L9fx7M7cJ7MDHqLqRTY9wh1qO87vUmYU5dILccYj9Rw8x1rv4Lfcb4L4ytiaGlcfoDK5mbOPh8qbkrU681ExyKzn1UAN4E/7lT/YSyauwrdPUdCnmaRudweRtn49Dra3OKPEicqPEiUWMy/MXullgMoJH8xVmwShNt4qCpbIBrHgnO+ONrJFmPFWYSbwEU0NPf8tE0mgEDFBcuCzpSemtIrcRyJKzeGvxw+ezc2PQ9djZ+sbVVZo= MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: e13614b1-dbef-4814-49ac-08d685186d75 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2019 12:02:07.5892 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR05MB4250 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jiri Pirko Move the struct to the place where they belong, alongside with the rest of the MR code. Signed-off-by: Jiri Pirko Signed-off-by: Ido Schimmel --- .../mellanox/mlxsw/spectrum_acl_tcam.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c index 5d29c5050401..11456e1f236f 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.c @@ -862,15 +862,6 @@ struct mlxsw_sp_acl_tcam_flower_rule { struct mlxsw_sp_acl_tcam_entry entry; }; -struct mlxsw_sp_acl_tcam_mr_ruleset { - struct mlxsw_sp_acl_tcam_chunk *chunk; - struct mlxsw_sp_acl_tcam_group group; -}; - -struct mlxsw_sp_acl_tcam_mr_rule { - struct mlxsw_sp_acl_tcam_entry entry; -}; - static int mlxsw_sp_acl_tcam_flower_ruleset_add(struct mlxsw_sp *mlxsw_sp, struct mlxsw_sp_acl_tcam *tcam, @@ -984,6 +975,15 @@ static const struct mlxsw_sp_acl_profile_ops mlxsw_sp_acl_tcam_flower_ops = { .rule_activity_get = mlxsw_sp_acl_tcam_flower_rule_activity_get, }; +struct mlxsw_sp_acl_tcam_mr_ruleset { + struct mlxsw_sp_acl_tcam_chunk *chunk; + struct mlxsw_sp_acl_tcam_group group; +}; + +struct mlxsw_sp_acl_tcam_mr_rule { + struct mlxsw_sp_acl_tcam_entry entry; +}; + static int mlxsw_sp_acl_tcam_mr_ruleset_add(struct mlxsw_sp *mlxsw_sp, struct mlxsw_sp_acl_tcam *tcam, From patchwork Mon Jan 28 12:02:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 1031883 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b="EF4rnJ6o"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43p7Xr2G1pz9s7h for ; Mon, 28 Jan 2019 23:02:20 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726945AbfA1MCS (ORCPT ); Mon, 28 Jan 2019 07:02:18 -0500 Received: from mail-eopbgr30068.outbound.protection.outlook.com ([40.107.3.68]:30567 "EHLO EUR03-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726668AbfA1MCR (ORCPT ); Mon, 28 Jan 2019 07:02:17 -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=rQk8/u53WR45N0LHZZgwgmenPFXOP0nxUUoIutSud1g=; b=EF4rnJ6oc3rVrmQ3tkc+1zybAh8saGiaLV9D814rhVE5wn32Q6aPeU1lAbqxpLPr2Ig99CuDgCrjrug0mmiMShH21K7F9ZmCA+5kZJ3xzPEUarhuVayMq8RkGq/94ZdgyOZkgb8SWcrF9aLDXEbNn4yWZU5RnH2QswfYV0i45Dg= Received: from DB7PR05MB4940.eurprd05.prod.outlook.com (20.176.235.152) by DB7PR05MB4250.eurprd05.prod.outlook.com (52.134.108.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.21; Mon, 28 Jan 2019 12:02:09 +0000 Received: from DB7PR05MB4940.eurprd05.prod.outlook.com ([fe80::6161:97fd:d315:7b07]) by DB7PR05MB4940.eurprd05.prod.outlook.com ([fe80::6161:97fd:d315:7b07%6]) with mapi id 15.20.1558.023; Mon, 28 Jan 2019 12:02:09 +0000 From: Ido Schimmel To: "netdev@vger.kernel.org" CC: "davem@davemloft.net" , Jiri Pirko , mlxsw , Ido Schimmel Subject: [PATCH net-next 3/7] mlxsw: spectrum_acl: Fix rul/rule typo Thread-Topic: [PATCH net-next 3/7] mlxsw: spectrum_acl: Fix rul/rule typo Thread-Index: AQHUtwFLUEd4azfRukG/85L44bO5KQ== Date: Mon, 28 Jan 2019 12:02:09 +0000 Message-ID: <20190128120131.2848-4-idosch@mellanox.com> References: <20190128120131.2848-1-idosch@mellanox.com> In-Reply-To: <20190128120131.2848-1-idosch@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6P194CA0090.EURP194.PROD.OUTLOOK.COM (2603:10a6:209:8f::31) To DB7PR05MB4940.eurprd05.prod.outlook.com (2603:10a6:10:1e::24) authentication-results: spf=none (sender IP is ) smtp.mailfrom=idosch@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.20.1 x-originating-ip: [193.47.165.251] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DB7PR05MB4250; 6:rf04MlXTOGuat6hDiIKUgHhnKv2uKtn7RwtD2eNaIDMswXHSMaSsTG8YRD3H0ZqLvlNYuBzdtmfSwk8o1rSgNreR03uvRL2OkTJYYeUgVXRyOVafdSBRCW30ntLNbctbT+jidnFmuALU3HTKIx+5CJmqAFg/7fQRiPEip/aziRi66NsXrYi3JOkZMN6BrHpyOuFj4D7E8ipfR+i5LFM2TlnIE5gHX5tZrIU/lSvbwMXkk2h+821YvZEcFUPhZUhTG46bJPNeJ0rR0PeD6saFzXFs037fWEJqMKtF68hAtbpsZk4eGZYjeKkznbB/uOhTqIO3jq3PI+SuBNv/v7R4t/c6nVNXhhc8hGYzs3YpX8gy/V7qp1ygU/CCqOvNlVb6VIE37KwNDqhjdIXq9rj8aQgxOJA85mVUBD9PP5a8znjiAbLceb2DiaZRWMuzqKkpjwik3/KcUXzOn2GueZwhgw==; 5:cMX8EB4f1jxgBT/4RBlzOTfBgXQH3LluiAxaYfJ710wMKkMQ1rqV4mM7xoRKNhvMKTlvV8CctwLOYnlkxIX4meynKU6PrvyYbVCmIEXHb7VR+5hnzNhIBxkTtYQGyMA/SU6qkXKyVJlOr5e/D2lqiy78BYsEiNChPrsuIYe0S+xSOGO3a6WQkiXSJcK8gW8tGGGmNdvLwFI/vQQr+u9KyA==; 7:yG267eLLl8ioBnpfFRrfG3Nw7bEAZdZh9GnC4VrGcG9nyKm2RJUe0eeHwCbFAOe/11oKkAZwdsgjNiF9ZoGgjH4RS9s6jTcOQVytAFQ+SxjCzCZulQHRCJ1DRtpeBXD/eGi5KsR+U5QTPLMdBOe6SQ== x-ms-office365-filtering-correlation-id: f59c6fc2-7e4f-4a74-6963-08d685186e12 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)(4605077)(4618075)(2017052603328)(7153060)(7193020); SRVR:DB7PR05MB4250; x-ms-traffictypediagnostic: DB7PR05MB4250: x-microsoft-antispam-prvs: x-forefront-prvs: 0931CB1479 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(346002)(396003)(376002)(136003)(39860400002)(366004)(199004)(189003)(446003)(11346002)(54906003)(478600001)(6916009)(36756003)(305945005)(14444005)(256004)(86362001)(81156014)(8676002)(6506007)(14454004)(486006)(2616005)(1730700003)(68736007)(105586002)(386003)(52116002)(102836004)(2351001)(476003)(106356001)(7736002)(76176011)(316002)(99286004)(186003)(53936002)(107886003)(25786009)(26005)(4326008)(81166006)(6486002)(6116002)(3846002)(2501003)(8936002)(97736004)(1076003)(6512007)(5640700003)(2906002)(6436002)(71200400001)(66066001)(71190400001)(50226002); DIR:OUT; SFP:1101; SCL:1; SRVR:DB7PR05MB4250; H:DB7PR05MB4940.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX: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: l3wkPK6PfqGLau3RTXMfwo0wMIFdZPfPnoVIuDqmK7gDZh99QIqjxrbDSWZ+Os7Dj9sjiiZpCioq0PIoOnJ/bb9SLxmy5KtKnrpKaieMx/HDXSAzPX1YrH3BXh/5kZTroP4kA/x3ggu5lqSUeBXQXmj0MVUM/fPp40SSkrqXHIkwpr+8zYEy5Zfir21zzmeeV675jzZZIwmqL11o5PEzbNiPJGlh/Vmb2uW9l1RhiLx+6VsWWc+WsNNR462umldqpF2C8JMvrRiaXK/kvTmpbs0evhH0CWGCFM+i5Vh8J/Udo8TgR8oR8iBu5RBHIy8vd4NCOZWK6tUJDvqM5vNc9UHeiD/ozzLNJYI5RkJ0fLiDz4mafiYQoXXKzt3zwyacq/aHE70y2VnsOI2d3lmqalrD8N8hcrpTQZ/X/48qGlw= MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: f59c6fc2-7e4f-4a74-6963-08d685186e12 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2019 12:02:08.6189 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR05MB4250 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jiri Pirko Signed-off-by: Jiri Pirko Signed-off-by: Ido Schimmel --- drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c index bd40ed065f3e..a69e3462b65e 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c @@ -805,7 +805,7 @@ static void mlxsw_sp_acl_rule_activity_work_schedule(struct mlxsw_sp_acl *acl) msecs_to_jiffies(interval)); } -static void mlxsw_sp_acl_rul_activity_update_work(struct work_struct *work) +static void mlxsw_sp_acl_rule_activity_update_work(struct work_struct *work) { struct mlxsw_sp_acl *acl = container_of(work, struct mlxsw_sp_acl, rule_activity_update.dw.work); @@ -884,7 +884,7 @@ int mlxsw_sp_acl_init(struct mlxsw_sp *mlxsw_sp) /* Create the delayed work for the rule activity_update */ INIT_DELAYED_WORK(&acl->rule_activity_update.dw, - mlxsw_sp_acl_rul_activity_update_work); + mlxsw_sp_acl_rule_activity_update_work); acl->rule_activity_update.interval = MLXSW_SP_ACL_RULE_ACTIVITY_UPDATE_PERIOD_MS; mlxsw_core_schedule_dw(&acl->rule_activity_update.dw, 0); return 0; From patchwork Mon Jan 28 12:02:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 1031884 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b="rwhYy1Oj"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43p7Xt4s2Wz9s3q for ; Mon, 28 Jan 2019 23:02:22 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726951AbfA1MCV (ORCPT ); Mon, 28 Jan 2019 07:02:21 -0500 Received: from mail-eopbgr30068.outbound.protection.outlook.com ([40.107.3.68]:30567 "EHLO EUR03-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726752AbfA1MCU (ORCPT ); Mon, 28 Jan 2019 07:02:20 -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=lOwElGmG6Ofik+4lzBp2LV4BHSl1Mmmk1WM2usUvAoM=; b=rwhYy1OjH9atJLxhXor96B6dHiuuX16TQqAI2l+VdbBuoqLKjLqipGkKccBq7m0ZbryfoCFt8zWyvssN2EiZadK1hG+NHBL49uCEy5K9795P5qtPxJ+lA45C5Vn1Jw1Cxuuhi+KxKMSU9Nwm8Wp1CWQrKTK0W9BYK1RlKG6jrnI= Received: from DB7PR05MB4940.eurprd05.prod.outlook.com (20.176.235.152) by DB7PR05MB4250.eurprd05.prod.outlook.com (52.134.108.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.21; Mon, 28 Jan 2019 12:02:10 +0000 Received: from DB7PR05MB4940.eurprd05.prod.outlook.com ([fe80::6161:97fd:d315:7b07]) by DB7PR05MB4940.eurprd05.prod.outlook.com ([fe80::6161:97fd:d315:7b07%6]) with mapi id 15.20.1558.023; Mon, 28 Jan 2019 12:02:10 +0000 From: Ido Schimmel To: "netdev@vger.kernel.org" CC: "davem@davemloft.net" , Jiri Pirko , mlxsw , Ido Schimmel , David Ahern Subject: [PATCH net-next 4/7] mlxsw: spectrum_switchdev: Add more extack messages Thread-Topic: [PATCH net-next 4/7] mlxsw: spectrum_switchdev: Add more extack messages Thread-Index: AQHUtwFMd2ozMHVoi0OcqsH+fiz6Pw== Date: Mon, 28 Jan 2019 12:02:10 +0000 Message-ID: <20190128120131.2848-5-idosch@mellanox.com> References: <20190128120131.2848-1-idosch@mellanox.com> In-Reply-To: <20190128120131.2848-1-idosch@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6P194CA0090.EURP194.PROD.OUTLOOK.COM (2603:10a6:209:8f::31) To DB7PR05MB4940.eurprd05.prod.outlook.com (2603:10a6:10:1e::24) authentication-results: spf=none (sender IP is ) smtp.mailfrom=idosch@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.20.1 x-originating-ip: [193.47.165.251] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DB7PR05MB4250; 6:t3xl3hWjvNXQ7PbmK4bX7rHm7ntb+ZxBgKrfwTXUI9y7k4Eyf5cxg1nj0s6zpNboBcOemSwiY4nzh8t90OtiEOm4k5J5AYBh3yhvAszyn8yYV1iTaFI94m4QzoyAqdoD4cvSrHo5Whq+DfSiec0uPcmUK1Kzzw3mIqPBPiVGpWP9kbBAMAyaXh3GAmx8P/6wqBL1C1151nFjJOVEn6tJVKQawn/SPpSdW+qeCQYbuo5o9izIyo09q7vQitI7sCt6ycAAppSTN7vXiFnCgNXxu1T7H5h9fTi6/kY0mjg+fHvXNVuGCdq375MsH7+qwkch0caqglYOguqmrAkHdANW5XU9DJfh1ocbdVu3wjP+W9rKHpogEsOaDC/V3qwqOtD2VZUHEE0Kli6Qwu2Hwbft2oBaphT1vvYYSsmdisLM+43Uk37V4wA6mxIL2IFHKyJnG0t5RUqTcjVs54j5QlMLXw==; 5:8wvUcpk3BYPrlrUAj35fMhv6u3A8JyD5Y3r0/vLLfRVo812Ku1Osy9gcdG0Jsy00UTI350Lio0aL2HCfCDHZQNBNE11a/T+2fisWS02FLbETfUig6kBVMY458/7UaFqyXAX2bM2dNULfIWgmKw8qf6P6YAnBz7UW/Md8B7XExTfQC1LTVArVSouaENOVo+ULnisOlIkim8icFxyRQuFGNA==; 7:PYnB0x2GlngmU3QPlvJ+k0bOOkM6psLCNnh3ulEhS056hnF0/oqD4hY2g8g+n/ADungUGbhE9Zp+eVIT23ByQzzSZCo7Tp67a2VDjqZ+xwQ/Ee4DLDA2pwGdPTvqiemNad0r1mHYrEHJJHJMcq+w3w== x-ms-office365-filtering-correlation-id: f26c6842-dce6-478e-ef04-08d685186eb7 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)(4605077)(4618075)(2017052603328)(7153060)(7193020); SRVR:DB7PR05MB4250; x-ms-traffictypediagnostic: DB7PR05MB4250: x-microsoft-antispam-prvs: x-forefront-prvs: 0931CB1479 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(346002)(396003)(376002)(136003)(39860400002)(366004)(199004)(189003)(446003)(11346002)(54906003)(478600001)(6916009)(36756003)(305945005)(256004)(86362001)(81156014)(8676002)(6506007)(14454004)(486006)(2616005)(1730700003)(68736007)(105586002)(386003)(52116002)(102836004)(2351001)(476003)(106356001)(7736002)(76176011)(316002)(99286004)(186003)(53936002)(39060400002)(25786009)(26005)(4326008)(81166006)(6486002)(6116002)(3846002)(2501003)(8936002)(97736004)(1076003)(6512007)(15650500001)(5640700003)(2906002)(6436002)(71200400001)(66066001)(71190400001)(50226002); DIR:OUT; SFP:1101; SCL:1; SRVR:DB7PR05MB4250; H:DB7PR05MB4940.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX: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: KRhqVCc2kYwQEHv+/QvQbbMth/fy1iskYymsPaTrsR6zPMroU2s9fnsNopc3DoVJFhP2XgSbGzYfdNwkfLLjGIYIJNmki8AP5Nf1UA8R5T8cgsSIAOP/Mmn1DEJ8Wncihhap6D0fuFcq2/Fzr8/fr9cxtLAIQlTV7HA0vr+tFKB0drh8dCxGZquUfo/w3eDvSf2QrGFyfyZu+gD/9TVNkuJh+2MHlV3UGG/FzYj+NdnDX9BUS6RQyHue0Rf2ndRiFL+DJqTXUWiLfZkklIn/Q7ziX4Ja1woxUVcA6IT25YMVE8ryx6Jiq7WOvonA97QultgLiR7HLoI43vDBpjWyXTyozGNcismDQzkchhEW+LdmoIT65tqTwmOJhAPqqyvtCmI5bRPSVpwmCINwjQbRnDHxsnLzr4jRtXKBUNf7RyA= MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: f26c6842-dce6-478e-ef04-08d685186eb7 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2019 12:02:09.6056 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR05MB4250 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add more extack messages that let the user know why VXLAN offload failed. Signed-off-by: Ido Schimmel Suggested-by: David Ahern Cc: David Ahern --- .../net/ethernet/mellanox/mlxsw/spectrum_switchdev.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c index 0f4e68d31cc3..a4a9fe992193 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c @@ -2027,6 +2027,7 @@ mlxsw_sp_bridge_8021q_vxlan_join(struct mlxsw_sp_bridge_device *bridge_device, return 0; if (mlxsw_sp_fid_vni_is_set(fid)) { + NL_SET_ERR_MSG_MOD(extack, "VNI is already set on FID"); err = -EINVAL; goto err_vni_exists; } @@ -2213,10 +2214,13 @@ mlxsw_sp_bridge_8021d_vxlan_join(struct mlxsw_sp_bridge_device *bridge_device, int err; fid = mlxsw_sp_fid_8021d_lookup(mlxsw_sp, bridge_device->dev->ifindex); - if (!fid) + if (!fid) { + NL_SET_ERR_MSG_MOD(extack, "Did not find a corresponding FID"); return -EINVAL; + } if (mlxsw_sp_fid_vni_is_set(fid)) { + NL_SET_ERR_MSG_MOD(extack, "VNI is already set on FID"); err = -EINVAL; goto err_vni_exists; } @@ -3231,8 +3235,10 @@ mlxsw_sp_switchdev_vxlan_vlan_add(struct mlxsw_sp *mlxsw_sp, * the lookup function to return 'vxlan_dev' */ if (flag_untagged && flag_pvid && - mlxsw_sp_bridge_8021q_vxlan_dev_find(bridge_device->dev, vid)) + mlxsw_sp_bridge_8021q_vxlan_dev_find(bridge_device->dev, vid)) { + NL_SET_ERR_MSG_MOD(extack, "VLAN already mapped to a different VNI"); return -EINVAL; + } if (!netif_running(vxlan_dev)) return 0; From patchwork Mon Jan 28 12:02:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 1031885 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b="Xz1Jkkfp"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43p7Xx1fjmz9s3q for ; Mon, 28 Jan 2019 23:02:25 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726964AbfA1MCY (ORCPT ); Mon, 28 Jan 2019 07:02:24 -0500 Received: from mail-eopbgr30068.outbound.protection.outlook.com ([40.107.3.68]:30567 "EHLO EUR03-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726864AbfA1MCX (ORCPT ); Mon, 28 Jan 2019 07:02:23 -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=v+4yPUj5dUWN/ifgdU8v6sR+pstwWsQsJw7nCx085Ek=; b=Xz1JkkfpLU66GfgQSu5o1QrtBWxZ6+VJKqk+ncwLHgac/5rkS8lbGYIOfGA0kzp26J+pkyJTK0FRkVKniI6TDR5KHB9+W+o1awj/sUBGpds4czyXGPTN3p15R9zCpXK0TXwfnFmCMPhlk/roU2mj9rshKuMV5FSO1vNuVtp5XeM= Received: from DB7PR05MB4940.eurprd05.prod.outlook.com (20.176.235.152) by DB7PR05MB4250.eurprd05.prod.outlook.com (52.134.108.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.21; Mon, 28 Jan 2019 12:02:11 +0000 Received: from DB7PR05MB4940.eurprd05.prod.outlook.com ([fe80::6161:97fd:d315:7b07]) by DB7PR05MB4940.eurprd05.prod.outlook.com ([fe80::6161:97fd:d315:7b07%6]) with mapi id 15.20.1558.023; Mon, 28 Jan 2019 12:02:11 +0000 From: Ido Schimmel To: "netdev@vger.kernel.org" CC: "davem@davemloft.net" , Jiri Pirko , mlxsw , Ido Schimmel Subject: [PATCH net-next 5/7] Documentation: add devlink param file for mlxsw driver Thread-Topic: [PATCH net-next 5/7] Documentation: add devlink param file for mlxsw driver Thread-Index: AQHUtwFNoAx6Gcb+SE+GKhGztTGYwg== Date: Mon, 28 Jan 2019 12:02:11 +0000 Message-ID: <20190128120131.2848-6-idosch@mellanox.com> References: <20190128120131.2848-1-idosch@mellanox.com> In-Reply-To: <20190128120131.2848-1-idosch@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6P194CA0090.EURP194.PROD.OUTLOOK.COM (2603:10a6:209:8f::31) To DB7PR05MB4940.eurprd05.prod.outlook.com (2603:10a6:10:1e::24) authentication-results: spf=none (sender IP is ) smtp.mailfrom=idosch@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.20.1 x-originating-ip: [193.47.165.251] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DB7PR05MB4250; 6:ov1lbRJVYcmgcEH+HdA/RyRU+fgBOx7ehu2kG/FnRXsh5mh2yfXcQlkaDzP4BDvKtJ2bvkl9KS+FHdvK2l0HsiYZC2Hqlq3a7HyRasMqBMeNU+2C8FyfCVjDR9IgLY6IFzyRJtkRURsEIB2ziYlVUgZ9r/Y1r/OP0JZdLY4fURzaTZI/YAOa8UmGIP3ZADGM+Lqop7NHX6MuRGPkUFv8mx+Xalas0FtIekT9+e1dCnLcO87VXBZTMTxMepdZMX3y2e2yjUOToZy+iS8YzPRDKr15gcU498G+daEdWZ8uqRSFupokRlfq/XVLC35NPD94fv7JrEM0OR5ggfLmK9uZePijeGY4rhpCBENlS2HspUqgBLVDqoNLm76zzr115wz2VXEIaw8CKnauzX3P1sN1pO/3tzzp/07Wadjg8zl7IfnqreEItw7DYY5OKwMo/w2/1LyTX/8KZC7Baje2hiEHaQ==; 5:5wCQ3Uc9L0MmCQJircfpuyGjG5PcAVOe/RytrrTR2AfMKoz1r7/3w1HHiPpEJJlIZxgkWQxsp+2liNc0/Ozl2L860brbnnxu0gPCFaBEM9D/tC4ZhT6/0j4ktfGpMKZmCobwDajQP8PMjDLocoUE1OYno/QQnxsqercZ9Y32U5Ako1ngjUNr8wBxl2bWQLLmBWj4HAeU3YWB8JnQkGx6eg==; 7:8oNJLs1C8zVO5ottk9rCgou7T4RrRBXNIZIC1/VioxMy8UYeAfssCmhp/hLRFimUVF7KpOWFcV0nmm292agFfgsQTrLRkYQNfAYlvcLx2lJpzcZw4ELTbowAacnNAAeZrw/5216W6ZYCTF63tmb2+Q== x-ms-office365-filtering-correlation-id: 3a081ca9-bf3b-4112-d5fe-08d685186f53 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)(4605077)(4618075)(2017052603328)(7153060)(7193020); SRVR:DB7PR05MB4250; x-ms-traffictypediagnostic: DB7PR05MB4250: x-microsoft-antispam-prvs: x-forefront-prvs: 0931CB1479 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(346002)(396003)(376002)(136003)(39860400002)(366004)(199004)(189003)(446003)(11346002)(54906003)(478600001)(6916009)(36756003)(305945005)(256004)(86362001)(81156014)(8676002)(6506007)(14454004)(486006)(2616005)(1730700003)(68736007)(105586002)(386003)(52116002)(102836004)(2351001)(476003)(106356001)(7736002)(76176011)(316002)(99286004)(186003)(53936002)(107886003)(25786009)(26005)(4326008)(81166006)(6486002)(4744005)(6116002)(3846002)(2501003)(8936002)(97736004)(1076003)(6512007)(5640700003)(2906002)(6436002)(71200400001)(66066001)(71190400001)(50226002); DIR:OUT; SFP:1101; SCL:1; SRVR:DB7PR05MB4250; H:DB7PR05MB4940.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX: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: dGTzeraUu9LR6vtJL3uwUXYP2rHWFqLeJOtasMOyZ24nrIaePN43MchCQNVqHnVtow76VK23uzsBaqM2RLbt9H3an3/vHN0hrBV4nEKXWuWR3+cbv6/l71ORfEOn298hzKQXfA9vfcPiBCo3nvgbaF1peQkEXHJVnGWxIZzuFynE2m5S5yZnR+ibk1FlbDF9nAs8z8vm+tef/t8T1VDr0pgFaeANpO91j4a9QiE0IEBwmGzdPug5MrDQdUJ7/8UxE5pB47JuLJ70/cUqO+UJ85YDxmgXfV1YAtaAnVmv2fn4AaZnoLx+aMqkm4qIllTR2GWosWCNxLv/G7ai/E3nUxAg+5wK+M3kQl42NpScS4DvLN581ccBWpxeAzfASTvFDQ4c7ro87Mp8WuPdTEk7Drd/WCYDdVLB+AWQ8KIsBhs= MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3a081ca9-bf3b-4112-d5fe-08d685186f53 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2019 12:02:10.7234 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR05MB4250 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jiri Pirko Add initial documentation file for devlink params of mlxsw driver. Only "fw_load_policy" is now supported. Signed-off-by: Jiri Pirko Signed-off-by: Ido Schimmel --- Documentation/networking/devlink-params-mlxsw.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 Documentation/networking/devlink-params-mlxsw.txt diff --git a/Documentation/networking/devlink-params-mlxsw.txt b/Documentation/networking/devlink-params-mlxsw.txt new file mode 100644 index 000000000000..2c5c67a920c9 --- /dev/null +++ b/Documentation/networking/devlink-params-mlxsw.txt @@ -0,0 +1,2 @@ +fw_load_policy [DEVICE, GENERIC] + Configuration mode: driverinit From patchwork Mon Jan 28 12:02:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 1031886 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b="UZ3s6bVz"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43p7Xz3xZXz9s3q for ; Mon, 28 Jan 2019 23:02:27 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726877AbfA1MC0 (ORCPT ); Mon, 28 Jan 2019 07:02:26 -0500 Received: from mail-eopbgr30068.outbound.protection.outlook.com ([40.107.3.68]:30567 "EHLO EUR03-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726957AbfA1MCY (ORCPT ); Mon, 28 Jan 2019 07:02:24 -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=LprtLHncGT7kQ4RakKR8r1LH3tp/4PN1FtTf8hwDxWg=; b=UZ3s6bVzGTHNZtp276DEGI7/Bc+mZFkgS11u18QObBWUHYTVjbknq3O6MLklhxxj6jzCRwvPzVq0nbi7FS2OKQ6p6vUbZxTDFiCFlDIom6agP6/oVME8lw3nlI293cSktreVN4LQshQ89Q8eIT+SiKnU+R43WtsnD1llxAzwxKk= Received: from DB7PR05MB4940.eurprd05.prod.outlook.com (20.176.235.152) by DB7PR05MB4250.eurprd05.prod.outlook.com (52.134.108.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.21; Mon, 28 Jan 2019 12:02:12 +0000 Received: from DB7PR05MB4940.eurprd05.prod.outlook.com ([fe80::6161:97fd:d315:7b07]) by DB7PR05MB4940.eurprd05.prod.outlook.com ([fe80::6161:97fd:d315:7b07%6]) with mapi id 15.20.1558.023; Mon, 28 Jan 2019 12:02:12 +0000 From: Ido Schimmel To: "netdev@vger.kernel.org" CC: "davem@davemloft.net" , Jiri Pirko , mlxsw , Ido Schimmel Subject: [PATCH net-next 6/7] selftests: net: forwarding: change devlink resource support checking Thread-Topic: [PATCH net-next 6/7] selftests: net: forwarding: change devlink resource support checking Thread-Index: AQHUtwFNfkg7MtBce0mikiJHC5RKZQ== Date: Mon, 28 Jan 2019 12:02:12 +0000 Message-ID: <20190128120131.2848-7-idosch@mellanox.com> References: <20190128120131.2848-1-idosch@mellanox.com> In-Reply-To: <20190128120131.2848-1-idosch@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6P194CA0090.EURP194.PROD.OUTLOOK.COM (2603:10a6:209:8f::31) To DB7PR05MB4940.eurprd05.prod.outlook.com (2603:10a6:10:1e::24) authentication-results: spf=none (sender IP is ) smtp.mailfrom=idosch@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.20.1 x-originating-ip: [193.47.165.251] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DB7PR05MB4250; 6:Pq6ZiJBUmzVy0aeYSXtI4zB32KEc+iwuMzngFjKJmz270A60mTEeczhHO9P1i55p0WdwZkD9c7Tmh07qadR0z/DV5led13dul2KKavG5X2j+akr9hlH3/G3cIvGgxJhJgUGQGYZnXdWvOAa+A0HLLJc4xdxtxC3zAbzNYQChg5HzDcDiVOvBBPDvb6Nhi9tehWzV9eNzPOdMnZ1JEhx1usX+31EVaxUskkpCnEblrX1RuvO4Xxa19zlCskctNoGYzy+fB70AuDk00wy965dD16AWUK89PSOezmfIrCE5sE0I0VaUOh5q5ShYLY6EIoKrCjg+1470IHll+4cWJAB6p1aQvfBB+pYfCpd5VV5AgFdHf1YvyUx48dATiMFAV3JIZoiKB6cV2pwDszzIDknpFlL0U2diI9U2KgXhjSbBnSyM/BKJf2KlrGqGg5Ndzv/MTR1MQxYV2pjRPxzrf2NRmg==; 5:xJUTXl4OzZirV8paZ6OdabHbT4kB0EZMTkNtkKwhAs8KHoQOuKSNgPH8B4kWznSkYpeYf4vnRnnJls9A14qP8nCYt50lKj1jthq0RfU3EC7E5DWATKRF44qOU0MxrquHBLKZLgawOipqtcAf5BA22zN8smCMVMHz1Y7LHjHM+GMmbKu/nLG/torNv2YX8SpG1C9kbeqYomqR7H8xAZbohw==; 7:M9Bf7+kIvlV63FFdiwBe2b9A6TwTPZlY4d6EH0PnK0sO8rAAfzQx8KtUjxzxF8XIyl+XCxukuHgoPiMF85TJjjStknbjAVwVgihQ0SAYpmIGmPt7Djo2neVtP3O+hDyOKZtYnFvzdx3uVieFWB/NRA== x-ms-office365-filtering-correlation-id: 6f772e5f-2442-4a01-cac9-08d685186ff2 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)(4605077)(4618075)(2017052603328)(7153060)(7193020); SRVR:DB7PR05MB4250; x-ms-traffictypediagnostic: DB7PR05MB4250: x-microsoft-antispam-prvs: x-forefront-prvs: 0931CB1479 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(346002)(396003)(376002)(136003)(39860400002)(366004)(199004)(189003)(446003)(11346002)(54906003)(478600001)(6916009)(36756003)(305945005)(14444005)(256004)(86362001)(81156014)(8676002)(6506007)(14454004)(486006)(2616005)(1730700003)(68736007)(105586002)(386003)(52116002)(102836004)(2351001)(476003)(106356001)(7736002)(76176011)(316002)(99286004)(186003)(53936002)(107886003)(25786009)(26005)(4326008)(81166006)(6486002)(4744005)(6116002)(3846002)(2501003)(8936002)(97736004)(1076003)(6512007)(5640700003)(2906002)(6436002)(71200400001)(66066001)(71190400001)(50226002); DIR:OUT; SFP:1101; SCL:1; SRVR:DB7PR05MB4250; H:DB7PR05MB4940.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX: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: 0qr0T3iquX54WuA8hR4i1jIGaURRZHVA8gEqNDOBN9sCqEMKnEHu1I5f8a7n4ei7VfmXskg9Q7OYrjUdGapZsUTY9oYoH/nquvUWtOjCBGDtcASQ3HudqS2hW3x0YDV1H9BN4+F+cBURoP5Q/AlQahc1d5Mhen5XZjBqr+ScXY3rlVaCL6Az+Sda4zjkRbBkueKuPBW4KZHl1XbIqBIZ80LbvVOjxtlzXlLnaEVvh2iC0uSDYLs9np1U6cFXhcKRb8kkOmsV7c9KrqSOZAvQlpoyDDLPiEZgaYS6X2aslhu3ZHApyCzf7HUzcO6C/DzsSjFKlK+F1fH0IMH925j1ZDBUGKhzGVrNKO8/CLTqtGt1Z6OspWvZv9HgW+ctMMBJpvTqfDI+p/HKnFcMC4cIrAZ3Gvq0M6UDnRj9ewAZd88= MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6f772e5f-2442-4a01-cac9-08d685186ff2 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2019 12:02:11.7651 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR05MB4250 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jiri Pirko As for the others, check help message output to find out if devlink supports "resource" object. Signed-off-by: Jiri Pirko Signed-off-by: Ido Schimmel --- tools/testing/selftests/net/forwarding/devlink_lib.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/forwarding/devlink_lib.sh b/tools/testing/selftests/net/forwarding/devlink_lib.sh index 5ab1e5f43022..57cf8914910d 100644 --- a/tools/testing/selftests/net/forwarding/devlink_lib.sh +++ b/tools/testing/selftests/net/forwarding/devlink_lib.sh @@ -32,7 +32,7 @@ DEVLINK_VIDDID=$(lspci -s $(echo $DEVLINK_DEV | cut -d"/" -f2) \ ############################################################################## # Sanity checks -devlink -j resource show "$DEVLINK_DEV" &> /dev/null +devlink help 2>&1 | grep resource &> /dev/null if [ $? -ne 0 ]; then echo "SKIP: iproute2 too old, missing devlink resource support" exit 1 From patchwork Mon Jan 28 12:02:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 1031882 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b="VqoTJ181"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43p7Xq2hlYz9s3q for ; Mon, 28 Jan 2019 23:02:19 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726925AbfA1MCS (ORCPT ); Mon, 28 Jan 2019 07:02:18 -0500 Received: from mail-eopbgr60085.outbound.protection.outlook.com ([40.107.6.85]:60048 "EHLO EUR04-DB3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726783AbfA1MCQ (ORCPT ); Mon, 28 Jan 2019 07:02:16 -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=4d0mtMJg+cKi1MD9p7K/KhNIGnvrDGicB6gpmAH69d4=; b=VqoTJ181SRbhoK04VuZUNUFw5K2MlXZBnanuC06PTEq8uF4DS1iKipfffTEaDNRrfH1PNgNIr0fh3r39rdoril49X5wy9Wk/+WnDxZto0GjCzJJgifkkEuKYqFTl/muUdeqoII6KLmlynJnr48Px623e9uMVKXutxmr2OJZaNYE= Received: from DB7PR05MB4940.eurprd05.prod.outlook.com (20.176.235.152) by DB7PR05MB4810.eurprd05.prod.outlook.com (20.176.235.78) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.21; Mon, 28 Jan 2019 12:02:13 +0000 Received: from DB7PR05MB4940.eurprd05.prod.outlook.com ([fe80::6161:97fd:d315:7b07]) by DB7PR05MB4940.eurprd05.prod.outlook.com ([fe80::6161:97fd:d315:7b07%6]) with mapi id 15.20.1558.023; Mon, 28 Jan 2019 12:02:13 +0000 From: Ido Schimmel To: "netdev@vger.kernel.org" CC: "davem@davemloft.net" , Jiri Pirko , mlxsw , Ido Schimmel , David Ahern Subject: [PATCH net-next 7/7] selftests: forwarding: Use OK instead of PASS in test output Thread-Topic: [PATCH net-next 7/7] selftests: forwarding: Use OK instead of PASS in test output Thread-Index: AQHUtwFO8NJJlHJZQEKCk3dH26gXqA== Date: Mon, 28 Jan 2019 12:02:13 +0000 Message-ID: <20190128120131.2848-8-idosch@mellanox.com> References: <20190128120131.2848-1-idosch@mellanox.com> In-Reply-To: <20190128120131.2848-1-idosch@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6P194CA0090.EURP194.PROD.OUTLOOK.COM (2603:10a6:209:8f::31) To DB7PR05MB4940.eurprd05.prod.outlook.com (2603:10a6:10:1e::24) authentication-results: spf=none (sender IP is ) smtp.mailfrom=idosch@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.20.1 x-originating-ip: [193.47.165.251] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DB7PR05MB4810; 6:Md88ZOjhIlZ3eFHuKGPwiMW2dq/0jFJkp5z2No2fXe3dhOWQGR7mZ6jKX4csel7989em6icYK4gcmYNfgsv3bB51GQZGP2KZRkrqmqXjWAfTU8QiVr5zcIq4o0PUGH4u53GLltsiMVJe6HTTHnVRHB9cWX/KrKgySZIZRbGIOWbIsm7ZyF4KVsJp5BHhw9SCG3RSZPgLI5BdJzvKcqIhRXS7M9jS9a+Ot5S0GgZ/o+WJPkbCGklerWWNeaJfnWh4UC6Q9XfCE3VCF8Ya3gDYzuHMoCZvjHAygYrQKUH+jYR2IMhApDgFWI3I/LTGg/7wLyCxL7LzitvPL3QAR7+IhiHsdzLHWgZBySLmvWDVRO1Q8YAX12zvvirYy/F7bcZXDYLzRcCHaoIWHk3GIYEnZ2jC9ewetp3W1rMEriHerhz5mm61O+R3B0UxuTTMnUOWNRWtmEhvJtSmd4yoO9VWaw==; 5:7VfeCBFRSjXAVLHfuF1JBKsipkT0PmBkuX+SC+cpBqTlPre1l9Q+0rzRwJqoewT6p9gB4O3VJuA1Mg3I+VXteCI1wGwImG32+rrelFt1FEb8P7lPppcvOCHWpa3zeIhb+TO1HjqGTftpv6pvxxbi9gv8nIpuV9ZSNoLUniIHSA/5xktnXTLwk1wcGeQEhPNer3gc7z+vB6IFw+5wBo8MuA==; 7:6n8U06l1hwDaSL4sY1v2+nHSB57Jp9aeAWWEPvCitFaL/w5qM0t1bfy6AGqIMMWOfiHS+zjD8E3NZJps+pnzmxQgh19KLyOeFjEPnPtUfUGsrUd5DFtoDeRIQ9jhgfJWzjLnHWhRAXcV4sgX1KiOqQ== x-ms-office365-filtering-correlation-id: 9e69e0cb-f049-424b-0bf8-08d68518709d 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)(4605077)(4618075)(2017052603328)(7153060)(7193020); SRVR:DB7PR05MB4810; x-ms-traffictypediagnostic: DB7PR05MB4810: x-microsoft-antispam-prvs: x-forefront-prvs: 0931CB1479 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(396003)(346002)(376002)(136003)(366004)(39860400002)(199004)(189003)(71190400001)(71200400001)(36756003)(66066001)(97736004)(486006)(14454004)(186003)(1076003)(26005)(6116002)(386003)(8936002)(6512007)(68736007)(6436002)(3846002)(5640700003)(6486002)(305945005)(2501003)(6506007)(2906002)(102836004)(81156014)(1730700003)(478600001)(81166006)(8676002)(39060400002)(53936002)(316002)(4744005)(52116002)(4326008)(2616005)(476003)(105586002)(25786009)(11346002)(256004)(54906003)(2351001)(6916009)(106356001)(14444005)(7736002)(86362001)(76176011)(99286004)(446003)(50226002); DIR:OUT; SFP:1101; SCL:1; SRVR:DB7PR05MB4810; H:DB7PR05MB4940.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX: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: 5mVHyN3NSs1QDGG+hHxjenkdqnN5lylMF8biDT6LQB/SbCbF3Lww40vw1SnO0Z30/++yeRBcJax/oC+9YejtcpMNwCLTyfI+xnHVjr/QmT+iQnYtkjoSYkdQ5YW5Go+4n61X4ju35YBA3zfeTR4NLNqIJxp0sHXVRSEPZ/3D4qKPNde2d5Wz6nP1innyPqzzJEjsQdDknzDGqywVPMcUdzI7IID34maB5QXJWN6Qiyb/RQykyaZPH2HrF6q9QYjUhDc0vnP+/hG2UySbC2QoIX1+3PB++s90b4rpVWPZk7Ssn7xgGHLJcDyi6GHefavxgq456yDOj80o66OHsEe4whfZydmSLeZFPAI93IMvnxGYcpaDMbuv+MLKfHLgkMaBVXWOcp96e6r0yGS0eK/pdDyzIP4LXfpNm7DFrMnZ3RI= MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9e69e0cb-f049-424b-0bf8-08d68518709d X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2019 12:02:12.8019 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR05MB4810 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org It is easier to distinguish "[ OK ]" from "[FAIL]" than "[PASS]". Signed-off-by: Ido Schimmel Suggested-by: David Ahern Cc: David Ahern --- tools/testing/selftests/net/forwarding/lib.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/forwarding/lib.sh b/tools/testing/selftests/net/forwarding/lib.sh index 3f248d1f5b91..c1f16bb992dc 100644 --- a/tools/testing/selftests/net/forwarding/lib.sh +++ b/tools/testing/selftests/net/forwarding/lib.sh @@ -211,7 +211,7 @@ log_test() return 1 fi - printf "TEST: %-60s [PASS]\n" "$test_name $opt_str" + printf "TEST: %-60s [ OK ]\n" "$test_name $opt_str" return 0 }