From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-eopbgr40056.outbound.protection.outlook.com [40.107.4.56]) by dpdk.org (Postfix) with ESMTP id 5DA261B598 for ; Thu, 20 Dec 2018 01:17:18 +0100 (CET) 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=2JczEKpybwNBd9PMcDMakhn2v21oArwhgJyJKkQ9CM0=; b=w+0SglwF21OI4pW+e3/08Akd1qCB0wE+B6M+uFyI9YL0KwkiNgr2pfKY8juWvFaKcdEN8qoVesaN/2wW7NSeHST6f3V7TMJg5OSVzpXHfhe4i+OSFZQPLfebuDbEp6tpMy9Y3EvM+Qd4TkM71938CkblhDclYiD7B9lkUIcyxUo= Received: from DB3PR0502MB3980.eurprd05.prod.outlook.com (52.134.72.27) by DB3PR0502MB4010.eurprd05.prod.outlook.com (52.134.66.28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1425.22; Thu, 20 Dec 2018 00:17:16 +0000 Received: from DB3PR0502MB3980.eurprd05.prod.outlook.com ([fe80::d43a:3775:8af7:29c6]) by DB3PR0502MB3980.eurprd05.prod.outlook.com ([fe80::d43a:3775:8af7:29c6%3]) with mapi id 15.20.1425.025; Thu, 20 Dec 2018 00:17:16 +0000 From: Yongseok Koh To: Stephen Hemminger CC: Gaetan Rivet , dpdk stable Thread-Topic: [dpdk-stable] patch 'net/failsafe: use prefix for function' has been queued to LTS release 17.11.5 Thread-Index: AQHUiDlDPYTkIPfr3E6CJuYGb2gGEKWG4kWA Date: Thu, 20 Dec 2018 00:17:16 +0000 Message-ID: <31108C4E-3D70-4A36-A7FD-B78E04E96017@mellanox.com> References: <20181129231202.30436-1-yskoh@mellanox.com> <20181129231202.30436-59-yskoh@mellanox.com> In-Reply-To: <20181129231202.30436-59-yskoh@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: spf=none (sender IP is ) smtp.mailfrom=yskoh@mellanox.com; x-originating-ip: [69.181.245.183] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DB3PR0502MB4010; 6:lCcYu2VCZhUYNI3yHoLF665pNmd2vXojxdL6lnzpx5vTC9cwm0/EDXLt3xH/fTmFQ6n+BjpmkGaI54ZuQ+InggzPWnDZIXwKVe87Rf/wXMZrbHnjDT4jwzV2C1OaR+4q+w0qcKdZRB2rnHB85e0XVllY+DNByLSEfQ1INnFTB1iGPjoGiRko618bMFJvDNFr1G28ALER8gShQ7D/dwuqonJbLrmPUL4yxKSV8c4CXJeqQNc1jaahDAz8dCi8/s74JAP3nZa9DaVhDcwiOC6gcnu9frAolb/QDKvMat1AUnPRoaWx/+2agIQM0lDErPa72v2bros43sxLS2T92pE9IzDWjTcUwTQdoxsY70CxW7KdLCYxVlbYX6LOV9qwOQpOSYMcG7hlEZ1ZdwJvdWsMXPfzZfpQf+B8vU4H0qi8Nve2oZ/TlGLPJlsM4yI7teI1+r0mKAsGdOxeeeey8GOBUQ==; 5:ZziDC3ZcD9E1i1mSM0yic/paRh4Z2UJD1pxI27eit+s4c6RQUzCHCxkUhTbk/dDxEN+AUlffbKP26pputU9JGPebBlJ8z4m8K0l3dEPWT6bBeA+OYKyom/3FhLgr5gKIoVTxpTsY9xFQq7WE8YvCDVc7Qlc514lbWJy/qZMUtxk=; 7:Gq4p1Kb5ieMr3ITyNPgx7h4tYqL0Bo1Cml386oEr6nEg3KtReg/i64kMgmbBIu6RGb807I9CEUzdy23ALqhj7xrM2EOimi384BHsg7c6EH5j9Ojo4LydECC5Rl/NaD0I2FY5h3CStIzjXTxfHn7GdA== x-ms-exchange-antispam-srfa-diagnostics: SOS; x-ms-office365-filtering-correlation-id: 5f9104d9-ceba-4224-e3b3-08d666107f99 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:DB3PR0502MB4010; x-ms-traffictypediagnostic: DB3PR0502MB4010: x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(3230021)(999002)(5005026)(6040522)(2401047)(8121501046)(10201501046)(3002001)(3231475)(944501520)(4982022)(52105112)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(20161123564045)(20161123560045)(201708071742011)(7699051)(76991095); SRVR:DB3PR0502MB4010; BCL:0; PCL:0; RULEID:; SRVR:DB3PR0502MB4010; x-forefront-prvs: 0892FA9A88 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(396003)(136003)(376002)(346002)(366004)(39860400002)(69234005)(189003)(199004)(28163001)(3846002)(229853002)(966005)(256004)(106356001)(14454004)(76176011)(6116002)(66066001)(81166006)(97736004)(45080400002)(6486002)(105586002)(2906002)(4326008)(99286004)(6436002)(4001150100001)(6246003)(5660300001)(6306002)(6512007)(81156014)(36756003)(33656002)(25786009)(54906003)(71190400001)(478600001)(83716004)(8936002)(71200400001)(53936002)(186003)(102836004)(6916009)(2616005)(575784001)(53546011)(86362001)(7736002)(316002)(26005)(446003)(68736007)(6506007)(486006)(476003)(11346002)(82746002)(305945005); DIR:OUT; SFP:1101; SCL:1; SRVR:DB3PR0502MB4010; H:DB3PR0502MB3980.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-microsoft-antispam-message-info: COcDgxTVD3nanihcV40G2/Wm4RsqQRMplLD+2SFqtYGiwXDtiNQrh46M1fl5nBiIpz25OjWZ/3WbzsjvLnmxJQ9JbPjtstohfAy06ONp2AuOFJV2pZZ+oMo1Uh3PNcuS73HD1gG/EGCcyaYQ3iaict+PwD1r74hgRty82HaCpCMrHENyYEVsoT/VjPp5siGTkNO+I/9ebF2HRnq43CLem9S9CVc+iBREe0PXnClkaoQOh6JRCKjcR3LJi1rxBdHA849oQ10RLQkt6sM3b9zG/hhvaz1t/L4TaQTt7c1bZl4XAq5CQeM2233xqpPHOWOI spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="us-ascii" Content-ID: <3DD8A495717C874AA2CE3DE7F5F25C1F@eurprd05.prod.outlook.com> Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5f9104d9-ceba-4224-e3b3-08d666107f99 X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Dec 2018 00:17:16.4711 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR0502MB4010 Subject: Re: [dpdk-stable] patch 'net/failsafe: use prefix for function' has been queued to LTS release 17.11.5 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: Thu, 20 Dec 2018 00:17:18 -0000 Hi, This patch is being removed from stable/17.11 as it was mistakenly merged. Patches having 'fix' keyword in the title were merged even though those don= 't have "Cc: stable@dpdk.org" tag in the commit message. If you think this patch is still needed for stable/17.11, please let me kno= w. Then I'll take it back. Thanks, Yongseok > On Nov 29, 2018, at 3:10 PM, Yongseok Koh wrote: >=20 > Hi, >=20 > FYI, your patch has been queued to LTS release 17.11.5 >=20 > Note it hasn't been pushed to https://emea01.safelinks.protection.outlook= .com/?url=3Dhttp%3A%2F%2Fdpdk.org%2Fbrowse%2Fdpdk-stable&data=3D02%7C01= %7Cyskoh%40mellanox.com%7Cc67ee1031dab42ef000608d65650629c%7Ca652971c7d2e4d= 9ba6a4d149256f461b%7C0%7C0%7C636791300627516921&sdata=3DBw1JWchNKSVXoEB= 8U3NWJXyOtnQYixGcqOsOY8ndXYg%3D&reserved=3D0 yet. > It will be pushed if I get no objections before 12/01/18. So please > shout if anyone has objections. >=20 > Also note that after the patch there's a diff of the upstream commit vs t= he patch applied > to the branch. If the code is different (ie: not only metadata diffs), du= e for example to > a change in context or macro names, please double check it. >=20 > Thanks. >=20 > Yongseok >=20 > --- > From 1e254728404576db680bf5e3e1ec99204aa0815f Mon Sep 17 00:00:00 2001 > From: Stephen Hemminger > Date: Mon, 8 Oct 2018 15:31:40 -0700 > Subject: [PATCH] net/failsafe: use prefix for function >=20 > [ upstream commit 86123c2dfb94416b4fb17e07bf31d32172308623 ] >=20 > All other visible functions in failsafe driver have 'failsafe_' > prefix. >=20 > Signed-off-by: Stephen Hemminger > Acked-by: Gaetan Rivet > --- > drivers/net/failsafe/failsafe_ether.c | 2 +- > drivers/net/failsafe/failsafe_private.h | 4 ++-- > drivers/net/failsafe/failsafe_rxtx.c | 2 +- > 3 files changed, 4 insertions(+), 4 deletions(-) >=20 > diff --git a/drivers/net/failsafe/failsafe_ether.c b/drivers/net/failsafe= /failsafe_ether.c > index 5b5ac42ba..06aeea7ab 100644 > --- a/drivers/net/failsafe/failsafe_ether.c > +++ b/drivers/net/failsafe/failsafe_ether.c > @@ -488,7 +488,7 @@ failsafe_eth_rmv_event_callback(uint16_t port_id __rt= e_unused, > /* Switch as soon as possible tx_dev. */ > fs_switch_dev(sdev->fs_dev, sdev); > /* Use safe bursts in any case. */ > - set_burst_fn(sdev->fs_dev, 1); > + failsafe_set_burst_fn(sdev->fs_dev, 1); > /* > * Async removal, the sub-PMD will try to unregister > * the callback at the source of the current thread context. > diff --git a/drivers/net/failsafe/failsafe_private.h b/drivers/net/failsa= fe/failsafe_private.h > index 40eabb784..c71baea38 100644 > --- a/drivers/net/failsafe/failsafe_private.h > +++ b/drivers/net/failsafe/failsafe_private.h > @@ -164,7 +164,7 @@ int failsafe_hotplug_alarm_cancel(struct rte_eth_dev = *dev); >=20 > /* RX / TX */ >=20 > -void set_burst_fn(struct rte_eth_dev *dev, int force_safe); > +void failsafe_set_burst_fn(struct rte_eth_dev *dev, int force_safe); >=20 > uint16_t failsafe_rx_burst(void *rxq, > struct rte_mbuf **rx_pkts, uint16_t nb_pkts); > @@ -376,7 +376,7 @@ fs_switch_dev(struct rte_eth_dev *dev, > } else { > return; > } > - set_burst_fn(dev, 0); > + failsafe_set_burst_fn(dev, 0); > rte_wmb(); > } >=20 > diff --git a/drivers/net/failsafe/failsafe_rxtx.c b/drivers/net/failsafe/= failsafe_rxtx.c > index 178294c2e..4744702cd 100644 > --- a/drivers/net/failsafe/failsafe_rxtx.c > +++ b/drivers/net/failsafe/failsafe_rxtx.c > @@ -57,7 +57,7 @@ fs_tx_unsafe(struct sub_device *sdev) > } >=20 > void > -set_burst_fn(struct rte_eth_dev *dev, int force_safe) > +failsafe_set_burst_fn(struct rte_eth_dev *dev, int force_safe) > { > struct sub_device *sdev; > uint8_t i; > --=20 > 2.11.0 >=20 > --- > Diff of the applied patch vs upstream commit (please double-check if non= -empty: > --- > --- - 2018-11-29 15:01:47.834705064 -0800 > +++ 0059-net-failsafe-use-prefix-for-function.patch 2018-11-29 15:01:45.1= 41959000 -0800 > @@ -1,8 +1,10 @@ > -From 86123c2dfb94416b4fb17e07bf31d32172308623 Mon Sep 17 00:00:00 2001 > +From 1e254728404576db680bf5e3e1ec99204aa0815f Mon Sep 17 00:00:00 2001 > From: Stephen Hemminger > Date: Mon, 8 Oct 2018 15:31:40 -0700 > Subject: [PATCH] net/failsafe: use prefix for function >=20 > +[ upstream commit 86123c2dfb94416b4fb17e07bf31d32172308623 ] > + > All other visible functions in failsafe driver have 'failsafe_' > prefix. >=20 > @@ -15,10 +17,10 @@ > 3 files changed, 4 insertions(+), 4 deletions(-) >=20 > diff --git a/drivers/net/failsafe/failsafe_ether.c b/drivers/net/failsafe= /failsafe_ether.c > -index 884b86882..178316521 100644 > +index 5b5ac42ba..06aeea7ab 100644 > --- a/drivers/net/failsafe/failsafe_ether.c > +++ b/drivers/net/failsafe/failsafe_ether.c > -@@ -570,7 +570,7 @@ failsafe_eth_rmv_event_callback(uint16_t port_id __r= te_unused, > +@@ -488,7 +488,7 @@ failsafe_eth_rmv_event_callback(uint16_t port_id __r= te_unused, > /* Switch as soon as possible tx_dev. */ > fs_switch_dev(sdev->fs_dev, sdev); > /* Use safe bursts in any case. */ > @@ -28,10 +30,10 @@ > * Async removal, the sub-PMD will try to unregister > * the callback at the source of the current thread context. > diff --git a/drivers/net/failsafe/failsafe_private.h b/drivers/net/failsa= fe/failsafe_private.h > -index b9d4608ab..442e6199f 100644 > +index 40eabb784..c71baea38 100644 > --- a/drivers/net/failsafe/failsafe_private.h > +++ b/drivers/net/failsafe/failsafe_private.h > -@@ -193,7 +193,7 @@ int failsafe_hotplug_alarm_cancel(struct rte_eth_dev= *dev); > +@@ -164,7 +164,7 @@ int failsafe_hotplug_alarm_cancel(struct rte_eth_dev= *dev); >=20 > /* RX / TX */ >=20 > @@ -40,7 +42,7 @@ >=20 > uint16_t failsafe_rx_burst(void *rxq, > struct rte_mbuf **rx_pkts, uint16_t nb_pkts); > -@@ -473,7 +473,7 @@ fs_switch_dev(struct rte_eth_dev *dev, > +@@ -376,7 +376,7 @@ fs_switch_dev(struct rte_eth_dev *dev, > } else { > return; > } > @@ -50,10 +52,10 @@ > } >=20 > diff --git a/drivers/net/failsafe/failsafe_rxtx.c b/drivers/net/failsafe/= failsafe_rxtx.c > -index 7bd0f963e..034f47b87 100644 > +index 178294c2e..4744702cd 100644 > --- a/drivers/net/failsafe/failsafe_rxtx.c > +++ b/drivers/net/failsafe/failsafe_rxtx.c > -@@ -29,7 +29,7 @@ fs_tx_unsafe(struct sub_device *sdev) > +@@ -57,7 +57,7 @@ fs_tx_unsafe(struct sub_device *sdev) > } >=20 > void