From patchwork Tue Oct 16 12:45:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerin Jacob X-Patchwork-Id: 46892 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 07E6D5F2C; Tue, 16 Oct 2018 14:45:44 +0200 (CEST) Received: from NAM05-CO1-obe.outbound.protection.outlook.com (mail-eopbgr720044.outbound.protection.outlook.com [40.107.72.44]) by dpdk.org (Postfix) with ESMTP id 4864A5F22; Tue, 16 Oct 2018 14:45:42 +0200 (CEST) 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=IuoU/yP1nbkovnz87abJoAGK1j9byI24CP9qyhMnc90=; b=niWm1+wMBSwQC4dcUTL8F2a7wF0IVlgXIgDl/WWt0RBBWYdodXKP2kaW27StZCmNzFEfkuobElEux9kHmnn6yccalRt9YIecFWgqE9o+iIMb3LRDQrIja6BhJGLtVYMDM6GoICq6c5gdLNJXlvc6zH6r38Np4DN3ZCzU0j2VP/g= Received: from BYAPR07MB4997.namprd07.prod.outlook.com (52.135.238.214) by BYAPR07MB4181.namprd07.prod.outlook.com (52.135.222.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1228.26; Tue, 16 Oct 2018 12:45:40 +0000 Received: from BYAPR07MB4997.namprd07.prod.outlook.com ([fe80::c5c:4d86:b353:175a]) by BYAPR07MB4997.namprd07.prod.outlook.com ([fe80::c5c:4d86:b353:175a%4]) with mapi id 15.20.1228.027; Tue, 16 Oct 2018 12:45:40 +0000 From: Jerin Jacob To: Olivier Matz CC: "dev@dpdk.org" , "thomas@monjalon.net" , "ferruh.yigit@intel.com" , "arybchenko@solarflare.com" , "Jacob, Jerin" , "stable@dpdk.org" Thread-Topic: [dpdk-dev] [PATCH v2 1/2] mbuf: fix missing Tx offload flag name and list update Thread-Index: AQHUZU4k3mfoaDkbC0moYwIUoiXfyA== Date: Tue, 16 Oct 2018 12:45:40 +0000 Message-ID: <20181016124459.17433-1-jerin.jacob@caviumnetworks.com> References: <20181011193440.31995-1-jerin.jacob@caviumnetworks.com> In-Reply-To: <20181011193440.31995-1-jerin.jacob@caviumnetworks.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [202.83.56.73] x-clientproxiedby: MA1PR01CA0135.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:35::29) 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; BYAPR07MB4181; 6:CRpazroypVGekSUiEFFY+eceTpzzziQQ1M0iquuUVV+hbzDy1SJWiMSE90ESixE20xTQqjRjT4dCqkdESNlLg2Bhehg9Gk5ik8HTeI4/VI4+bHVe7fnej647h925ObZkNKxt3Ze6k5ljqhOSeDn7tCrQiBs6dnkKQsHMMAIIsC92fqYAmw8s+O4t4FR/SjBOcZmjQixx1SAVxsS9eIxZ/hIYBEFSJU6VYE113S+CbZAkh/AgnvNAhWd/QZa3c/vvrazegg5FRgaO4SQ+aI2n0WgSr3qmgyADdvIr1sSSlp83B6ciwXoPmyw+N0ajeH+jSqUkVTbL5GB4ixbbWwCtSkwbE9zuQlSLziC8GAKmIUscUEMTh36eI8Z8ihcCaMID3UfWL6gZcM0zWPG7+kZy5835Jqt33teOwJZ8A4sbPBm8lzLlqMQ2Ibgx7hTLfpCbrQ4VPuvx6hm/V/MJ59yTyA==; 5:aQ9FMCpdNiaqJquuoWBQ1na9qxgd7KrqisbCxU66GvSstIrwJyQ0KHtnXQ7Y99e6JtV1F/W/0VtR6D5NzVhKj1vY5/49I3D1vfYICQeIWG1+C/ZhFs307OvGMdNl6NAowKH4ZkvcmVVs4uS/gFXe9ycplI2ucdAUI1ogUrs5u3g=; 7:26FzoIJzNDs0K27+TfpZDLDv8hHJ2Ag9JV3KLr6FVZ2MQCyfqS0IV3cPDsjRgXtOZ3Ruu7UUe4G37hXWUSRIhippvG53UwDAHIWOKPGXGhpGTX7rccR7XCYVe5LAXiaZ0eN/IkgT+8jcfiER+5mCbGdTaThU3L8L4DrAlten2WloT++zUbj6R/jgLFhQnbBqOBSeTKpJaQeNv6gud/xpy5exJnm7ZLxIpJnSR76OkmzSksCT4M4MT5VndSHu6z92 x-ms-office365-filtering-correlation-id: 0b8e487a-ebc4-490e-d284-08d6336546c8 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:BYAPR07MB4181; x-ms-traffictypediagnostic: BYAPR07MB4181: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:; x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(93006095)(10201501046)(3231355)(944501410)(4982022)(52105095)(3002001)(149066)(150057)(6041310)(20161123562045)(20161123558120)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(201708071742011)(7699051); SRVR:BYAPR07MB4181; BCL:0; PCL:0; RULEID:; SRVR:BYAPR07MB4181; x-forefront-prvs: 0827D7ACB9 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39860400002)(136003)(346002)(366004)(376002)(396003)(199004)(189003)(7110500001)(6436002)(42882007)(2900100001)(8936002)(478600001)(72206003)(6486002)(186003)(25786009)(966005)(14454004)(1857600001)(15650500001)(2420400007)(4326008)(106356001)(6916009)(53936002)(14444005)(8676002)(256004)(105586002)(81156014)(81166006)(6506007)(71200400001)(26005)(99286004)(6512007)(6306002)(102836004)(66066001)(575784001)(2616005)(76176011)(3846002)(6116002)(52116002)(97736004)(316002)(71190400001)(386003)(476003)(305945005)(5250100002)(10710500007)(68736007)(1076002)(486006)(446003)(2906002)(11346002)(7736002)(5660300001)(54906003)(36756003); DIR:OUT; SFP:1101; SCL:1; SRVR:BYAPR07MB4181; H:BYAPR07MB4997.namprd07.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: a9ToHQlgwv9Oyst89ymZZmN5O5SP1dgp5ctFGzus8d3kvLBQnLb6UeXI46t4uk6OrV20bP7IPvJbdnDW0S1A/+A9KoncQJuRJbCMILNP58VvgyuMuCwtDc4JUtSY8CcI1l/g7fvHokaVgJRGL07ARP7ti98s9e52HBFMoiOOaVOr0zntX5mcaU/Z9898g0HBTLfIkgqu7R6gH6+Yo2n4aupLUVf1jBP7ML3r7V25Nu8emM4yTjTDdbIS658UVmnZ3yx8MgDB3M2HprnjsianWVnw1qYvsTHyAaW955L8kyx3z+nACM71mQYM2I8TMrttNNuxCx1IjtxVopXSjZ9klQ== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0b8e487a-ebc4-490e-d284-08d6336546c8 X-MS-Exchange-CrossTenant-originalarrivaltime: 16 Oct 2018 12:45:40.1940 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR07MB4181 Subject: [dpdk-dev] [PATCH v2 1/2] mbuf: fix missing Tx offload flag name and list update 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" Fix missing PKT_TX* ol_flag name and list updatation. Fixes: 6d18505efaa6 ("vhost: support UDP Fragmentation Offload") Fixes: 829a1c2c41dc ("mbuf: extend flow director field") Fixes: 63c0d74daaa9 ("mbuf: add Tx side tunneling type") Cc: stable@dpdk.org Signed-off-by: Jerin Jacob Reviewed-by: Ferruh Yigit --- v2: - Fix remaning PKT_TX* and PKT_RX flags name and list update(Ferruh Yigit) http://patches.dpdk.org/patch/46657/ --- 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 5297beb51..bb95d3a5c 100644 --- a/lib/librte_mbuf/rte_mbuf.c +++ b/lib/librte_mbuf/rte_mbuf.c @@ -296,6 +296,8 @@ const char *rte_get_rx_ol_flag_name(uint64_t mask) case PKT_RX_VLAN_STRIPPED: return "PKT_RX_VLAN_STRIPPED"; 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_QINQ: return "PKT_RX_QINQ"; case PKT_RX_LRO: return "PKT_RX_LRO"; @@ -339,6 +341,8 @@ rte_get_rx_ol_flag_list(uint64_t mask, char *buf, size_t buflen) { PKT_RX_VLAN_STRIPPED, PKT_RX_VLAN_STRIPPED, NULL }, { 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 }, { PKT_RX_TIMESTAMP, PKT_RX_TIMESTAMP, NULL }, @@ -386,7 +390,7 @@ rte_get_rx_ol_flag_list(uint64_t mask, char *buf, size_t buflen) 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"; case PKT_TX_SCTP_CKSUM: return "PKT_TX_SCTP_CKSUM"; @@ -406,8 +410,10 @@ const char *rte_get_tx_ol_flag_name(uint64_t mask) case PKT_TX_TUNNEL_VXLAN_GPE: return "PKT_TX_TUNNEL_VXLAN_GPE"; 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; } } @@ -417,7 +423,7 @@ int 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 }, { PKT_TX_SCTP_CKSUM, PKT_TX_L4_MASK, NULL }, @@ -430,24 +436,18 @@ rte_get_tx_ol_flag_list(uint64_t mask, char *buf, size_t buflen) { PKT_TX_OUTER_IP_CKSUM, PKT_TX_OUTER_IP_CKSUM, NULL }, { 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 }, { PKT_TX_OUTER_UDP_CKSUM, PKT_TX_OUTER_UDP_CKSUM, NULL }, }; const char *name;