[dpdk-stable] patch 'mbuf: fix offload flag name and list' has been queued to stable release 18.08.1

[Jerin Jacob]

-----Original Message-----
> Date: Fri, 30 Nov 2018 10:18:48 +0000
> From: Kevin Traynor <ktraynor at redhat.com>
> To: Jerin Jacob <jerin.jacob at caviumnetworks.com>
> CC: Ferruh Yigit <ferruh.yigit at intel.com>, dpdk stable <stable at dpdk.org>
> Subject: Re: [dpdk-stable] patch 'mbuf: fix offload flag name and list' has
>  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
> 
> 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 vs 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 apply
> > 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.
> >
> 
> Rebased patch is here
> https://github.com/kevintraynor/dpdk/commit/b7e35d460e736a6cf5a298d8aedb312eb2c1759e
> . Please confirm it's ok.

Looks good to me.

> 
> thanks,
> Kevin.
> 
> >> Thanks.
> >>
> >> Kevin Traynor
> >>
> >> ---
> >> From c8675533e066af6f00080bf4aa94a040146b298f Mon Sep 17 00:00:00 2001
> >> From: Jerin Jacob <jerin.jacob at caviumnetworks.com>
> >> 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 <jerin.jacob at caviumnetworks.com>
> >> Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
> >> ---
> >>  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[] = {
> >> -            { 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;
> >>
> >
>