From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5943FA2EEB for ; Tue, 10 Sep 2019 09:53:52 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id AA1171E53E; Tue, 10 Sep 2019 09:53:51 +0200 (CEST) Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-eopbgr50084.outbound.protection.outlook.com [40.107.5.84]) by dpdk.org (Postfix) with ESMTP id 231722C38 for ; Tue, 10 Sep 2019 09:53:50 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=X8DQpW6rwhlQOsOY7zfUHwpUkaPSkvMUcj1Uqbnz0sInLMgwzk8T9HLPbhsXvMBpXcxBXDt+pK7kJi7POSNly1fk8EZDg4GWfM2gNbSNz6u6Plv/cpb4b415xySxsAeVqC09UuMafTXnKdLNuRxRhYqUn9U8yc945uJeamz57MqpZFvBpiOcEMqH9/uy+RvBkRrFzwzucensCgQkfps+mIAcz0tRiERs+RBeQTGC+UOI+QTVEzF5XDdcutiLMqdTMzlwSJS764zLZdzGwP6d7FoGJmzCdjXWUm7cW3NXLTk8Sg+JzyGx77yevga6OlH3MnhvqC1K0Z7WZYF6C8ysdQ== 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-SenderADCheck; bh=c0bQ8vpOz+F+qcw/KY1pRJOAFvOOcLbxB0DTFTG+3Dk=; b=UJAdUOCVuJk0dMX4XcdESf+WN5qPjm2XOmsCRQ7IGYIzCL+gJ4AjcTOjeMSjKP6oEBODcZySUzk0O5Duu/ECZrT2XKMIdZu/YMzTpviqCgQPCsiekk0nNHXSkDtZTkj43rTyy0ORReUfSyEgwpudYVD2ST5H9ZTb3pyr3BoDjkiIbZ+iX1j3rsL/9cAKLYT3c9X6Gg5pmyb+EzJ1BPKrtxyl5MAUQ4cudiPaR2tbeNBzobYkmcNkSD6qjBXo62czDjmdEELvcqfpLFpHHvYtAhjysjfmWx2BLKjvM8bIkYrLcGTo2g/gfOudNCf06DbAGygw8rnyrbLBDXe+kX2XVw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com; dkim=pass header.d=mellanox.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=c0bQ8vpOz+F+qcw/KY1pRJOAFvOOcLbxB0DTFTG+3Dk=; b=QQe+2totj/hufC7X9ULGYWWSRNs7XudT+qXVSGZ+O1FTv8Y7g4wqk4bwqyilGQ2yID/s7pu8A7Utc+gtcvA6G1ob0mYhwhvpaBidCT9Bf4reYPRcqSFb5q5dG/Fg4KhoXe/JjQIIml9eF95Zva9OkXMjr1mtW/eSNyCKQRRkncY= Received: from AM0PR0502MB4019.eurprd05.prod.outlook.com (52.133.39.139) by AM0PR0502MB3617.eurprd05.prod.outlook.com (52.133.45.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2241.18; Tue, 10 Sep 2019 07:53:48 +0000 Received: from AM0PR0502MB4019.eurprd05.prod.outlook.com ([fe80::7deb:8e17:1363:e00e]) by AM0PR0502MB4019.eurprd05.prod.outlook.com ([fe80::7deb:8e17:1363:e00e%7]) with mapi id 15.20.2241.018; Tue, 10 Sep 2019 07:53:48 +0000 From: Matan Azrad To: Andrew Rybchenko , Slava Ovsiienko CC: "dev@dpdk.org" Thread-Topic: [PATCH v2 04/13] ethdev: change promiscuous callbacks to return status Thread-Index: AQHVZwYDgDBqCVg/bk+PY8dnDGyQ/6ckiYnA Date: Tue, 10 Sep 2019 07:53:48 +0000 Message-ID: References: <1567699852-31693-1-git-send-email-arybchenko@solarflare.com> <1568030331-16526-1-git-send-email-arybchenko@solarflare.com> <1568030331-16526-5-git-send-email-arybchenko@solarflare.com> In-Reply-To: <1568030331-16526-5-git-send-email-arybchenko@solarflare.com> Accept-Language: en-US, he-IL Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: spf=none (sender IP is ) smtp.mailfrom=matan@mellanox.com; x-originating-ip: [193.47.165.251] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 8b279464-eaac-4a6c-cac2-08d735c4037d x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600166)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020); SRVR:AM0PR0502MB3617; x-ms-traffictypediagnostic: AM0PR0502MB3617:|AM0PR0502MB3617: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:595; x-forefront-prvs: 01565FED4C x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(346002)(136003)(39860400002)(376002)(396003)(366004)(189003)(199004)(5660300002)(6506007)(6116002)(66066001)(486006)(11346002)(478600001)(71190400001)(71200400001)(52536014)(26005)(186003)(476003)(229853002)(6636002)(102836004)(256004)(86362001)(99286004)(2906002)(25786009)(316002)(14454004)(446003)(7696005)(33656002)(76176011)(110136005)(6436002)(305945005)(55016002)(9686003)(6246003)(14444005)(7736002)(53936002)(74316002)(66556008)(66476007)(8936002)(4326008)(64756008)(66946007)(76116006)(3846002)(66446008)(81156014)(81166006)(8676002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR0502MB3617; H:AM0PR0502MB4019.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: pbLWU29vHX+sjB79P9M2l9Rsl6N1uiOrGtGEuADObM8hGTkNbLRsuwXN0DPF1LBfTiDDtq8wUij95e1BYgUs9VALSOMW1C1cpxFZhYhlZZ1I7eUUYI1FVtOku4CnjCzWL1SecyglG0EN6QQUVJ4Zo31fcPKoGRvBtP0iTwOqVhucGX+PVJRYTAc62/cb8Yzhz/ajOYng9DQiTWt/KpOVxCUq/oGLG3a1Mwfbw3Gts+yQGOihlBcErqkNueuVfIJl/hoHjlfoINzUj5JZXp0Vo1nnejImLLbfsU2BtklsU3ysORF0yFI7jepaBzf236WNSOcb6hla86cALYI1XoCfT0fsAgswK9k4+LtH4cd4kKUiZkRp60lDNCQA8oLBOsn16n5TmQATUovIKApztQqHk9OSPX6IzM1scxYmhh+4uc0= Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8b279464-eaac-4a6c-cac2-08d735c4037d X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Sep 2019 07:53:48.3592 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: MNzVoGRXg2iLoC2S5l5gAZkqzxs/0QuZDZdNeKl+vOaP/bYh09FHXPf3hJ0ker+yj+bFVzHTtmchzkcLaP/9TA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR0502MB3617 Subject: Re: [dpdk-dev] [PATCH v2 04/13] ethdev: change promiscuous callbacks to return status X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Hi Review for mlx5 part: Added not very important comment below. You can stay it as is if no new version will be created. Acked-by: Matan Azrad Thanks. From: Andrew Rybchenko > Enabling/disabling of promiscuous mode is not always successful and > it should be taken into account to be able to handle it properly. >=20 > When correct return status is unclear from driver code, -EAGAIN is used. >=20 > drivers/net/mlx4/mlx4.h | 4 +- > drivers/net/mlx4/mlx4_ethdev.c | 24 ++++++++--- > drivers/net/mlx5/mlx5.h | 4 +- > drivers/net/mlx5/mlx5_rxmode.c | 40 ++++++++++++++--- >=20 > static void > diff --git a/drivers/net/mlx4/mlx4.h b/drivers/net/mlx4/mlx4.h > index 7730b530af..21517d70a2 100644 > --- a/drivers/net/mlx4/mlx4.h > +++ b/drivers/net/mlx4/mlx4.h > @@ -205,8 +205,8 @@ int mlx4_mtu_get(struct mlx4_priv *priv, uint16_t > *mtu); > int mlx4_mtu_set(struct rte_eth_dev *dev, uint16_t mtu); > int mlx4_dev_set_link_down(struct rte_eth_dev *dev); > int mlx4_dev_set_link_up(struct rte_eth_dev *dev); > -void mlx4_promiscuous_enable(struct rte_eth_dev *dev); > -void mlx4_promiscuous_disable(struct rte_eth_dev *dev); > +int mlx4_promiscuous_enable(struct rte_eth_dev *dev); > +int mlx4_promiscuous_disable(struct rte_eth_dev *dev); > void mlx4_allmulticast_enable(struct rte_eth_dev *dev); > void mlx4_allmulticast_disable(struct rte_eth_dev *dev); > void mlx4_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index); > diff --git a/drivers/net/mlx4/mlx4_ethdev.c > b/drivers/net/mlx4/mlx4_ethdev.c > index 623ebd88cb..c8a73bc1f4 100644 > --- a/drivers/net/mlx4/mlx4_ethdev.c > +++ b/drivers/net/mlx4/mlx4_ethdev.c > @@ -341,13 +341,17 @@ enum rxmode_toggle { > * Pointer to Ethernet device structure. > * @param toggle > * Toggle to set. > + * > + * @return > + * 0 on success, a negative errno value otherwise and rte_errno is set= . > */ > -static void > +static int > mlx4_rxmode_toggle(struct rte_eth_dev *dev, enum rxmode_toggle > toggle) > { > struct mlx4_priv *priv =3D dev->data->dev_private; > const char *mode; > struct rte_flow_error error; > + int ret; >=20 > switch (toggle) { > case RXMODE_TOGGLE_PROMISC_OFF: > @@ -363,12 +367,16 @@ mlx4_rxmode_toggle(struct rte_eth_dev *dev, > enum rxmode_toggle toggle) > default: > mode =3D "undefined"; > } > - if (!mlx4_flow_sync(priv, &error)) > - return; > + > + ret =3D mlx4_flow_sync(priv, &error); > + if (!ret) > + return 0; > + > ERROR("cannot toggle %s mode (code %d, \"%s\")," > " flow error type %d, cause %p, message: %s", > mode, rte_errno, strerror(rte_errno), error.type, error.cause, > error.message ? error.message : "(unspecified)"); > + return ret; > } >=20 > /** > @@ -376,8 +384,11 @@ mlx4_rxmode_toggle(struct rte_eth_dev *dev, > enum rxmode_toggle toggle) > * > * @param dev > * Pointer to Ethernet device structure. > + * > + * @return > + * 0 on success, a negative errno value otherwise and rte_errno is set= . > */ > -void > +int > mlx4_promiscuous_enable(struct rte_eth_dev *dev) > { > mlx4_rxmode_toggle(dev, RXMODE_TOGGLE_PROMISC_ON); > @@ -388,8 +399,11 @@ mlx4_promiscuous_enable(struct rte_eth_dev > *dev) > * > * @param dev > * Pointer to Ethernet device structure. > + * > + * @return > + * 0 on success, a negative errno value otherwise and rte_errno is set= . > */ > -void > +int > mlx4_promiscuous_disable(struct rte_eth_dev *dev) > { > mlx4_rxmode_toggle(dev, RXMODE_TOGGLE_PROMISC_OFF); > diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h > index 8ddbb7a17c..11d540c3a5 100644 > --- a/drivers/net/mlx5/mlx5.h > +++ b/drivers/net/mlx5/mlx5.h > @@ -752,8 +752,8 @@ int mlx5_dev_rss_reta_update(struct rte_eth_dev > *dev, >=20 > /* mlx5_rxmode.c */ >=20 > -void mlx5_promiscuous_enable(struct rte_eth_dev *dev); > -void mlx5_promiscuous_disable(struct rte_eth_dev *dev); > +int mlx5_promiscuous_enable(struct rte_eth_dev *dev); > +int mlx5_promiscuous_disable(struct rte_eth_dev *dev); > void mlx5_allmulticast_enable(struct rte_eth_dev *dev); > void mlx5_allmulticast_disable(struct rte_eth_dev *dev); >=20 > diff --git a/drivers/net/mlx5/mlx5_rxmode.c > b/drivers/net/mlx5/mlx5_rxmode.c > index d5077db0db..c862fc9520 100644 > --- a/drivers/net/mlx5/mlx5_rxmode.c > +++ b/drivers/net/mlx5/mlx5_rxmode.c > @@ -28,8 +28,11 @@ > * > * @param dev > * Pointer to Ethernet device structure. > + * > + * @return > + * 0 on success, a negative errno value otherwise and rte_errno is set= . > */ > -void > +int > mlx5_promiscuous_enable(struct rte_eth_dev *dev) > { > struct mlx5_priv *priv =3D dev->data->dev_private; > @@ -41,14 +44,24 @@ mlx5_promiscuous_enable(struct rte_eth_dev *dev) > "port %u cannot enable promiscuous mode" > " in flow isolation mode", > dev->data->port_id); > - return; > + return 0; > + } > + if (priv->config.vf) { > + ret =3D mlx5_nl_promisc(dev, 1); > + if (ret) > + goto error; No need the jump, just return ret here and below. > } > - if (priv->config.vf) > - mlx5_nl_promisc(dev, 1); > ret =3D mlx5_traffic_restart(dev); > if (ret) > DRV_LOG(ERR, "port %u cannot enable promiscuous mode: > %s", > dev->data->port_id, strerror(rte_errno)); > + > +error: > + /* > + * rte_eth_dev_promiscuous_enable() rollback > + * dev->data->promiscuous in the case of failure. > + */ > + return ret; > } >=20 > /** > @@ -56,20 +69,33 @@ mlx5_promiscuous_enable(struct rte_eth_dev *dev) > * > * @param dev > * Pointer to Ethernet device structure. > + * > + * @return > + * 0 on success, a negative errno value otherwise and rte_errno is set= . > */ > -void > +int > mlx5_promiscuous_disable(struct rte_eth_dev *dev) > { > struct mlx5_priv *priv =3D dev->data->dev_private; > int ret; >=20 > dev->data->promiscuous =3D 0; > - if (priv->config.vf) > - mlx5_nl_promisc(dev, 0); > + if (priv->config.vf) { > + ret =3D mlx5_nl_promisc(dev, 0); > + if (ret) > + goto error; Same here. > + } > ret =3D mlx5_traffic_restart(dev); > if (ret) > DRV_LOG(ERR, "port %u cannot disable promiscuous mode: > %s", > dev->data->port_id, strerror(rte_errno)); > + > +error: > + /* > + * rte_eth_dev_promiscuous_disable() rollback > + * dev->data->promiscuous in the case of failure. > + */ > + return ret; > } >=20 > /**