From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by dpdk.org (Postfix) with ESMTP id 389592BD8 for ; Wed, 23 May 2018 15:40:17 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 May 2018 06:40:16 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,433,1520924400"; d="scan'208";a="42215642" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by fmsmga008.fm.intel.com with ESMTP; 23 May 2018 06:40:16 -0700 Received: from fmsmsx115.amr.corp.intel.com (10.18.116.19) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 23 May 2018 06:40:16 -0700 Received: from fmsmsx117.amr.corp.intel.com ([169.254.3.235]) by fmsmsx115.amr.corp.intel.com ([169.254.4.80]) with mapi id 14.03.0319.002; Wed, 23 May 2018 06:40:15 -0700 From: "Wiles, Keith" To: "luca.boccassi@gmail.com" CC: Ophir Munk , Raslan Darawsheh , dpdk stable Thread-Topic: patch 'net/tap: fix isolation mode toggling' has been queued to stable release 18.02.2 Thread-Index: AQHT8o8ODAEdDr3EwUW57c9StchnWKQ9x2IA Date: Wed, 23 May 2018 13:40:15 +0000 Message-ID: <327324A9-506E-4BC2-B77A-B617407A4869@intel.com> References: <20180516101323.2234-2-luca.boccassi@gmail.com> <20180523121010.8385-1-luca.boccassi@gmail.com> <20180523121010.8385-3-luca.boccassi@gmail.com> In-Reply-To: <20180523121010.8385-3-luca.boccassi@gmail.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.254.53.246] Content-Type: text/plain; charset="us-ascii" Content-ID: <35030EC2D47C0A45A7664EB150EDA064@intel.com> Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-stable] patch 'net/tap: fix isolation mode toggling' has been queued to stable release 18.02.2 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 May 2018 13:40:17 -0000 > On May 23, 2018, at 7:09 AM, luca.boccassi@gmail.com wrote: >=20 > Hi, >=20 > FYI, your patch has been queued to stable release 18.02.2 >=20 > Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. > It will be pushed if I get no objections before 05/25/18. So please > shout if anyone has objections. >=20 > Thanks. >=20 > Luca Boccassi >=20 > --- > From f7b5d10171989dec8a4322594e1d3d8e8790d518 Mon Sep 17 00:00:00 2001 > From: Ophir Munk > Date: Mon, 14 May 2018 22:26:27 +0000 > Subject: [PATCH] net/tap: fix isolation mode toggling >=20 > [ upstream commit 2ef1c0da894a9534d41475b8240cff1d04e79fdf ] >=20 > Running testpmd command "flow isolae 0" (i.e. disabling flow /isolae/isolate/ > isolation) followed by command "flow isolate 1" (i.e. enabling > flow isolation) may result in a TAP error: > PMD: Kernel refused TC filter rule creation (17): File exists >=20 > Root cause analysis: when disabling flow isolation we keep the local > rule to redirect packets on TX (TAP_REMOTE_TX index) while we add it > again when enabling flow isolation. As a result this rule is added > two times in a row which results in "File exists" error. > The fix is to identify the "File exists" error and silently ignore it. >=20 > Another issue occurs when enabling isolation mode several times in a > row in which case the same tc rules are added consecutively and > rte_flow structs are added to a linked list before removing the > previous rte_flow structs. > The fix is to act upon isolation mode command only when there is a > change from "0" to "1" (or vice versa). >=20 > Fixes: f503d2694825 ("net/tap: support flow API isolated mode") >=20 > Reviewed-by: Raslan Darawsheh > Signed-off-by: Ophir Munk > Acked-by: Keith Wiles > --- > drivers/net/tap/tap_flow.c | 24 ++++++++++++++---------- > 1 file changed, 14 insertions(+), 10 deletions(-) >=20 > diff --git a/drivers/net/tap/tap_flow.c b/drivers/net/tap/tap_flow.c > index 551b2d83d..84ecf0936 100644 > --- a/drivers/net/tap/tap_flow.c > +++ b/drivers/net/tap/tap_flow.c > @@ -1545,10 +1545,14 @@ tap_flow_isolate(struct rte_eth_dev *dev, > { > struct pmd_internals *pmd =3D dev->data->dev_private; >=20 > + /* normalize 'set' variable to contain 0 or 1 values */ > if (set) > - pmd->flow_isolate =3D 1; > - else > - pmd->flow_isolate =3D 0; > + set =3D 1; > + /* if already in the right isolation mode - nothing to do */ > + if ((set ^ pmd->flow_isolate) =3D=3D 0) > + return 0; > + /* mark the isolation mode for tap_flow_implicit_create() */ > + pmd->flow_isolate =3D set; > /* > * If netdevice is there, setup appropriate flow rules immediately. > * Otherwise it will be set when bringing up the netdevice (tun_alloc). > @@ -1556,20 +1560,20 @@ tap_flow_isolate(struct rte_eth_dev *dev, > if (!pmd->rxq[0].fd) > return 0; > if (set) { > - struct rte_flow *flow; > + struct rte_flow *remote_flow; >=20 > while (1) { > - flow =3D LIST_FIRST(&pmd->implicit_flows); > - if (!flow) > + remote_flow =3D LIST_FIRST(&pmd->implicit_flows); > + if (!remote_flow) > break; > /* > * Remove all implicit rules on the remote. > * Keep the local rule to redirect packets on TX. > * Keep also the last implicit local rule: ISOLATE. > */ > - if (flow->msg.t.tcm_ifindex =3D=3D pmd->if_index) > + if (remote_flow->msg.t.tcm_ifindex =3D=3D pmd->if_index) > break; > - if (tap_flow_destroy_pmd(pmd, flow, NULL) < 0) > + if (tap_flow_destroy_pmd(pmd, remote_flow, NULL) < 0) > goto error; > } > /* Switch the TC rule according to pmd->flow_isolate */ > @@ -1716,8 +1720,8 @@ int tap_flow_implicit_create(struct pmd_internals *= pmd, > } > err =3D tap_nl_recv_ack(pmd->nlsk_fd); > if (err < 0) { > - /* Silently ignore re-entering remote promiscuous rule */ > - if (errno =3D=3D EEXIST && idx =3D=3D TAP_REMOTE_PROMISC) > + /* Silently ignore re-entering existing rule */ > + if (errno =3D=3D EEXIST) > goto success; > RTE_LOG(ERR, PMD, > "Kernel refused TC filter rule creation (%d): %s\n", > --=20 > 2.14.2 >=20 Regards, Keith