From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM03-DM3-obe.outbound.protection.outlook.com (mail-eopbgr800070.outbound.protection.outlook.com [40.107.80.70]) by dpdk.org (Postfix) with ESMTP id D4B525F27 for ; Mon, 3 Dec 2018 06:52:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=koX8BS18/Q/Dxs0JKledMti+f7OhbzQhMngtw2P4ouQ=; b=ZQbV+NNjeHFmz686pyt+tr5ShjiW38Kbeyzjb/14FpOmGI8BTkDAaJ1aTBOXUX8wT8qlnvm3loFLw4B7h1GiebEbjf0Agr4AcgybLBmTHRYhQXfGdcYZdUCmI+ImrvSLRB3s1/RRsGAI+AHvstrPirS4QHTS672xSJYyERgCMck= Received: from BYAPR07MB4997.namprd07.prod.outlook.com (52.135.238.214) by BYAPR07MB6263.namprd07.prod.outlook.com (20.179.63.148) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1382.22; Mon, 3 Dec 2018 05:52:41 +0000 Received: from BYAPR07MB4997.namprd07.prod.outlook.com ([fe80::9d3a:7709:b7e5:8ccf]) by BYAPR07MB4997.namprd07.prod.outlook.com ([fe80::9d3a:7709:b7e5:8ccf%2]) with mapi id 15.20.1382.020; Mon, 3 Dec 2018 05:52:41 +0000 From: Jerin Jacob To: Kevin Traynor CC: Ferruh Yigit , dpdk stable Thread-Topic: [dpdk-stable] patch 'mbuf: fix offload flag name and list' has been queued to stable release 18.08.1 Thread-Index: AQHUgoOp/hkR+Q94EE6QMGvcN29AXqVcBK4AgAwidACABGyZgA== Date: Mon, 3 Dec 2018 05:52:41 +0000 Message-ID: <20181203055230.GA2904@jerin> References: <20181122164957.13003-1-ktraynor@redhat.com> <20181122164957.13003-14-ktraynor@redhat.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [122.178.219.219] x-clientproxiedby: SG2PR06CA0117.apcprd06.prod.outlook.com (2603:1096:1:1d::19) To BYAPR07MB4997.namprd07.prod.outlook.com (2603:10b6:a03:5b::22) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Jerin.JacobKollanukkaran@cavium.com; x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; BYAPR07MB6263; 6:Qtpdj/O4rSYa34HdxI/7jsL9EqQOoAuGPFOJ2mIYvBLIP4EW/Uy/cahImbUhovkvqobCqwbjUFZ0zTnkPPcYKFEivD9Fyl7lPMd4hykmpRgOgQOPd9jOiz+F3taDlCGJJpkAWfwunNWazkFDanVLw0rTaCZL+wF3UrdQxLCuoM53Xb/fqCEJl7cFSzfjmACcyep6+mCY5rDn3lxlxucN3A0+dTPVxfFrdXje60zZ4cns4Owl9VhnwBOrmfnxJ60s/YR4PUg5YwOVtbZpIXzbT7eRWHkxVt6ICLb6wHQJTaxr7Ba+3fyZxhzkhhHWwqycuLdAjHeC9TbfoUhMgezlpVNiJFzSViHe1PH5tj5iHuO4y3uGd1YLkG1BX4vquReNl3WcMWITZw2iF8r1kSXWEkcxU7skgBldHS8+omabZCIoUhzxv+bI/2KOXU7gfGlWl1qR4tJkUbbNBloS3DFLqA==; 5:6oLoHuXKhk5dYdx94bGoURHlifedwW3deSYRSytsqbwJ1DZyC5hIlr3lBOiKPEtHcJdvmoDWbfTMsKattJgPVGlino1JlZuFzJJwBLj7uXjv+aXW1taWbMtJR6T8O7J5rAucIL0z8DVwuRRPpcbw1D+QmbPLQ7YopjxMCISc4K8=; 7:GdUjLWMrpfEDxUVRa7C9ucY5xvm/i+k2qWF2GQ/7Aj/Uq0tcwIX/6xV4qjmPy13mhDKv+qzPpzwZuelvj0Eqr6Y6gT1OfhzEZ7MtC8CWcTkYbctTsTtoyQSi/4bLCnCZeN3kOuBluXFAUBy+iUDc/g== x-ms-office365-filtering-correlation-id: 6f80163b-fd6d-498a-6bfc-08d658e38975 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:BYAPR07MB6263; x-ms-traffictypediagnostic: BYAPR07MB6263: x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(93006095)(3231455)(999002)(944501493)(4982022)(52105112)(10201501046)(3002001)(148016)(149066)(150057)(6041310)(20161123564045)(20161123560045)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699051)(76991095); SRVR:BYAPR07MB6263; BCL:0; PCL:0; RULEID:; SRVR:BYAPR07MB6263; x-forefront-prvs: 08756AC3C8 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(7916004)(346002)(136003)(39860400002)(396003)(366004)(376002)(69234005)(28163001)(189003)(199004)(13464003)(68736007)(71200400001)(71190400001)(53376002)(5660300001)(6246003)(6486002)(93886005)(33656002)(4326008)(575784001)(3846002)(1076002)(6116002)(53936002)(14444005)(76176011)(33896004)(256004)(26005)(386003)(6506007)(102836004)(52116002)(97736004)(53546011)(6306002)(6512007)(9686003)(14454004)(478600001)(72206003)(42882007)(186003)(8676002)(8936002)(6916009)(81156014)(33716001)(99286004)(7736002)(305945005)(2906002)(316002)(105586002)(25786009)(6436002)(229853002)(106356001)(11346002)(966005)(486006)(66066001)(476003)(446003)(81166006)(54906003); DIR:OUT; SFP:1101; SCL:1; SRVR:BYAPR07MB6263; H:BYAPR07MB4997.namprd07.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: UloK+s97A4p1vV1XIzGCZJMPj3idiTELZiSZAwde4P6diDn9FmPpHIUG8FhledbhKWsU0qqyHSdsPYwO+cbSNAcCHF5Wu/+B0TWBTe8cYp9iVuV9S7Y+fcNzRAv5WRazPIgm4EvnYHPkJIMI3kKtr76IOnYjLlZeMtuu43g7+KgsAiFn3WuTKpmTk5JzkDXyPcXWX6LvvnVm5q02PAzl+DNoiKO2ZKrHSAAgcPNXetQu/tSQeRUNlKAQSR9eY8V5N6ADxH6x+evtvceGLb4I0t+aX2r1eQtaLkPUtjanZapusCPA+SZZmm2ng7DZykVe4tJyQjcJblg9F5csw0LqKq8PHfifHCgTSTFv+J6gUA8= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="us-ascii" Content-ID: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6f80163b-fd6d-498a-6bfc-08d658e38975 X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Dec 2018 05:52:41.0248 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR07MB6263 Subject: Re: [dpdk-stable] patch 'mbuf: fix offload flag name and list' has been queued to stable release 18.08.1 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: Mon, 03 Dec 2018 05:52:43 -0000 -----Original Message----- > Date: Fri, 30 Nov 2018 10:18:48 +0000 > From: Kevin Traynor > To: Jerin Jacob > CC: Ferruh Yigit , dpdk stable > Subject: Re: [dpdk-stable] patch 'mbuf: fix offload flag name and list' h= as > been queued to stable release 18.08.1 > User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 > Thunderbird/52.2.0 >=20 > On 11/22/2018 05:00 PM, Kevin Traynor wrote: > > On 11/22/2018 04:49 PM, Kevin Traynor wrote: > >> Hi, > >> > >> FYI, your patch has been queued to stable release 18.08.1 > >> > >> Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. > >> It will be pushed if I get no objections before 11/28/18. So please > >> shout if anyone has objections. > >> > >> Also note that after the patch there's a diff of the upstream commit v= s the patch applied > >> to the branch. If the code is different (ie: not only metadata diffs),= due for example to > >> a change in context or macro names, please double check it. > >> > > > > Jerin, please check this one carefully as it's for mbuf and didn't appl= y > > cleanly. If it's not clear from below diff I can send patch. Otherwise > > if you want to send a backport, I can just take that instead. > > >=20 > Rebased patch is here > https://github.com/kevintraynor/dpdk/commit/b7e35d460e736a6cf5a298d8aedb3= 12eb2c1759e > . Please confirm it's ok. Looks good to me. >=20 > thanks, > Kevin. >=20 > >> Thanks. > >> > >> Kevin Traynor > >> > >> --- > >> From c8675533e066af6f00080bf4aa94a040146b298f Mon Sep 17 00:00:00 2001 > >> From: Jerin Jacob > >> Date: Tue, 16 Oct 2018 12:45:40 +0000 > >> Subject: [PATCH] mbuf: fix offload flag name and list > >> > >> [ upstream commit c23e46594418119dbbb92e7f1b9eed2a476d4535 ] > >> > >> Fix missing PKT_TX* & PKT_RX* ol_flag name and fix ol_flag list. > >> > >> Fixes: 6d18505efaa6 ("vhost: support UDP Fragmentation Offload") > >> Fixes: 829a1c2c41dc ("mbuf: extend flow director field") > >> Fixes: 63c0d74daaa9 ("mbuf: add Tx side tunneling type") > >> > >> Signed-off-by: Jerin Jacob > >> Reviewed-by: Ferruh Yigit > >> --- > >> lib/librte_mbuf/rte_mbuf.c | 36 ++++++++++++++++++------------------ > >> 1 file changed, 18 insertions(+), 18 deletions(-) > >> > >> diff --git a/lib/librte_mbuf/rte_mbuf.c b/lib/librte_mbuf/rte_mbuf.c > >> index e714c5a59..8f3abd2ca 100644 > >> --- a/lib/librte_mbuf/rte_mbuf.c > >> +++ b/lib/librte_mbuf/rte_mbuf.c > >> @@ -297,4 +297,6 @@ const char *rte_get_rx_ol_flag_name(uint64_t mask) > >> case PKT_RX_IEEE1588_PTP: return "PKT_RX_IEEE1588_PTP"; > >> case PKT_RX_IEEE1588_TMST: return "PKT_RX_IEEE1588_TMST"; > >> + case PKT_RX_FDIR_ID: return "PKT_RX_FDIR_ID"; > >> + case PKT_RX_FDIR_FLX: return "PKT_RX_FDIR_FLX"; > >> case PKT_RX_QINQ_STRIPPED: return "PKT_RX_QINQ_STRIPPED"; > >> case PKT_RX_LRO: return "PKT_RX_LRO"; > >> @@ -334,4 +336,6 @@ rte_get_rx_ol_flag_list(uint64_t mask, char *buf, = size_t buflen) > >> { PKT_RX_IEEE1588_PTP, PKT_RX_IEEE1588_PTP, NULL }, > >> { PKT_RX_IEEE1588_TMST, PKT_RX_IEEE1588_TMST, NULL }, > >> + { PKT_RX_FDIR_ID, PKT_RX_FDIR_ID, NULL }, > >> + { PKT_RX_FDIR_FLX, PKT_RX_FDIR_FLX, NULL }, > >> { PKT_RX_QINQ_STRIPPED, PKT_RX_QINQ_STRIPPED, NULL }, > >> { PKT_RX_LRO, PKT_RX_LRO, NULL }, > >> @@ -374,5 +378,5 @@ const char *rte_get_tx_ol_flag_name(uint64_t mask) > >> { > >> switch (mask) { > >> - case PKT_TX_VLAN_PKT: return "PKT_TX_VLAN_PKT"; > >> + case PKT_TX_VLAN: return "PKT_TX_VLAN"; > >> case PKT_TX_IP_CKSUM: return "PKT_TX_IP_CKSUM"; > >> case PKT_TX_TCP_CKSUM: return "PKT_TX_TCP_CKSUM"; > >> @@ -394,6 +398,8 @@ const char *rte_get_tx_ol_flag_name(uint64_t mask) > >> case PKT_TX_TUNNEL_IP: return "PKT_TX_TUNNEL_IP"; > >> case PKT_TX_TUNNEL_UDP: return "PKT_TX_TUNNEL_UDP"; > >> + case PKT_TX_QINQ: return "PKT_TX_QINQ"; > >> case PKT_TX_MACSEC: return "PKT_TX_MACSEC"; > >> case PKT_TX_SEC_OFFLOAD: return "PKT_TX_SEC_OFFLOAD"; > >> + case PKT_TX_UDP_SEG: return "PKT_TX_UDP_SEG"; > >> default: return NULL; > >> } > >> @@ -405,5 +411,5 @@ rte_get_tx_ol_flag_list(uint64_t mask, char *buf, = size_t buflen) > >> { > >> const struct flag_mask tx_flags[] =3D { > >> - { PKT_TX_VLAN_PKT, PKT_TX_VLAN_PKT, NULL }, > >> + { PKT_TX_VLAN, PKT_TX_VLAN, NULL }, > >> { PKT_TX_IP_CKSUM, PKT_TX_IP_CKSUM, NULL }, > >> { PKT_TX_TCP_CKSUM, PKT_TX_L4_MASK, NULL }, > >> @@ -418,22 +424,16 @@ rte_get_tx_ol_flag_list(uint64_t mask, char *buf= , size_t buflen) > >> { PKT_TX_OUTER_IPV4, PKT_TX_OUTER_IPV4, NULL }, > >> { PKT_TX_OUTER_IPV6, PKT_TX_OUTER_IPV6, NULL }, > >> - { PKT_TX_TUNNEL_VXLAN, PKT_TX_TUNNEL_MASK, > >> - "PKT_TX_TUNNEL_NONE" }, > >> - { PKT_TX_TUNNEL_GRE, PKT_TX_TUNNEL_MASK, > >> - "PKT_TX_TUNNEL_NONE" }, > >> - { PKT_TX_TUNNEL_IPIP, PKT_TX_TUNNEL_MASK, > >> - "PKT_TX_TUNNEL_NONE" }, > >> - { PKT_TX_TUNNEL_GENEVE, PKT_TX_TUNNEL_MASK, > >> - "PKT_TX_TUNNEL_NONE" }, > >> - { PKT_TX_TUNNEL_MPLSINUDP, PKT_TX_TUNNEL_MASK, > >> - "PKT_TX_TUNNEL_NONE" }, > >> - { PKT_TX_TUNNEL_VXLAN_GPE, PKT_TX_TUNNEL_MASK, > >> - "PKT_TX_TUNNEL_NONE" }, > >> - { PKT_TX_TUNNEL_IP, PKT_TX_TUNNEL_MASK, > >> - "PKT_TX_TUNNEL_NONE" }, > >> - { PKT_TX_TUNNEL_UDP, PKT_TX_TUNNEL_MASK, > >> - "PKT_TX_TUNNEL_NONE" }, > >> + { PKT_TX_TUNNEL_VXLAN, PKT_TX_TUNNEL_MASK, NULL }, > >> + { PKT_TX_TUNNEL_GRE, PKT_TX_TUNNEL_MASK, NULL }, > >> + { PKT_TX_TUNNEL_IPIP, PKT_TX_TUNNEL_MASK, NULL }, > >> + { PKT_TX_TUNNEL_GENEVE, PKT_TX_TUNNEL_MASK, NULL }, > >> + { PKT_TX_TUNNEL_MPLSINUDP, PKT_TX_TUNNEL_MASK, NULL }, > >> + { PKT_TX_TUNNEL_VXLAN_GPE, PKT_TX_TUNNEL_MASK, NULL }, > >> + { PKT_TX_TUNNEL_IP, PKT_TX_TUNNEL_MASK, NULL }, > >> + { PKT_TX_TUNNEL_UDP, PKT_TX_TUNNEL_MASK, NULL }, > >> + { PKT_TX_QINQ, PKT_TX_QINQ, NULL }, > >> { PKT_TX_MACSEC, PKT_TX_MACSEC, NULL }, > >> { PKT_TX_SEC_OFFLOAD, PKT_TX_SEC_OFFLOAD, NULL }, > >> + { PKT_TX_UDP_SEG, PKT_TX_UDP_SEG, NULL }, > >> }; > >> const char *name; > >> > > >=20