From patchwork Mon Jul 13 16:13:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 6358 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id EE10C5A64; Mon, 13 Jul 2015 18:14:41 +0200 (CEST) Received: from mail-wg0-f43.google.com (mail-wg0-f43.google.com [74.125.82.43]) by dpdk.org (Postfix) with ESMTP id CB6EC5A5D for ; Mon, 13 Jul 2015 18:14:39 +0200 (CEST) Received: by wgjx7 with SMTP id x7so299973372wgj.2 for ; Mon, 13 Jul 2015 09:14:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:organization :user-agent:in-reply-to:references:mime-version :content-transfer-encoding:content-type; bh=s+3v8yz53GDxfEK9lRDH5uHd+44WfK3+QyCq11jN/+M=; b=JwR1ahhVOSGgn5mOvvUjCu1gZWZdDxfnGXz/pD0TCvcOZda8UiHqh+qaNAg/mlhE68 xvv9XQWW1OXs3cFpX8t6+Dzvng7b1Bq21qN7hqTFccTSVEWmqF3Y/qRj2qbOfA3zb+gR yayFx1+OacAVFPNR1wS85TUJLI/BUfea1PvWt5X5Ui5hCUzuSA9FqylQ8s+7HW0/lu25 c41fLh7dKxt78o/ejiGd/frwDsmk9vy48JFqjxHviu5TKDvOXVkt2Va6YxJUZjHfME+g 8jWu+QQ3lQw3TMJu5OV9CuqBVMuyVZf+PtrsGUk8hh144TYeVntoTp5drZT5ujI0emrW fDHw== X-Gm-Message-State: ALoCoQnuxC68BceNUo2bYryE0ZJXwFVLffS3eDw3KjU0nqWHAk4mHTBjRqdgd6C/74lxzhPwz+kD X-Received: by 10.180.13.106 with SMTP id g10mr23781405wic.8.1436804079697; Mon, 13 Jul 2015 09:14:39 -0700 (PDT) Received: from xps13.localnet (136-92-190-109.dsl.ovh.fr. [109.190.92.136]) by smtp.gmail.com with ESMTPSA id uc3sm2956445wib.2.2015.07.13.09.14.38 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Jul 2015 09:14:38 -0700 (PDT) From: Thomas Monjalon To: Helin Zhang Date: Mon, 13 Jul 2015 18:13:26 +0200 Message-ID: <2161590.Y1eMLetJSj@xps13> Organization: 6WIND User-Agent: KMail/4.14.8 (Linux/4.0.4-2-ARCH; KDE/4.14.8; x86_64; ; ) In-Reply-To: <1436459501-14173-20-git-send-email-helin.zhang@intel.com> References: <1435912347-19499-1-git-send-email-helin.zhang@intel.com> <1436459501-14173-1-git-send-email-helin.zhang@intel.com> <1436459501-14173-20-git-send-email-helin.zhang@intel.com> MIME-Version: 1.0 Cc: dev@dpdk.org Subject: Re: [dpdk-dev] [PATCH v10 19/19] mbuf: remove old packet type bit masks X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 2015-07-10 00:31, Helin Zhang: > As unified packet types are used instead, those old bit masks and > the relevant macros for packet type indication need to be removed. It breaks mlx4 and cxgbe drivers. The mlx4 driver didn't have the chance to be updated in this series. Adrien, please, could you help Helin to convert ol_flags to packet type? The cxgbe changes need to be updated after 78fc1a716ae8 ("cxgbe: improve Rx performance") I suggest this update: Acked-by: Helin Zhang --- a/drivers/net/cxgbe/sge.c +++ b/drivers/net/cxgbe/sge.c @@ -1419,7 +1419,11 @@ static int process_responses(struct sge_rspq *q, int budget, unmap_rx_buf(&rxq->fl); if (cpl->l2info & htonl(F_RXF_IP)) { +#ifdef RTE_NEXT_ABI + mbuf->packet_type = RTE_PTYPE_L3_IPV4; +#else pkt->ol_flags |= PKT_RX_IPV4_HDR; +#endif if (unlikely(!csum_ok)) pkt->ol_flags |= PKT_RX_IP_CKSUM_BAD; @@ -1427,7 +1431,11 @@ static int process_responses(struct sge_rspq *q, int budget, htonl(F_RXF_UDP | F_RXF_TCP)) && !csum_ok) pkt->ol_flags |= PKT_RX_L4_CKSUM_BAD; } else if (cpl->l2info & htonl(F_RXF_IP6)) { +#ifdef RTE_NEXT_ABI + mbuf->packet_type = RTE_PTYPE_L3_IPV6; +#else pkt->ol_flags |= PKT_RX_IPV6_HDR; +#endif }