From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 86592A0547 for ; Mon, 19 Apr 2021 09:14:55 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 61377411C0; Mon, 19 Apr 2021 09:14:55 +0200 (CEST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mails.dpdk.org (Postfix) with ESMTP id E944340040; Mon, 19 Apr 2021 09:14:51 +0200 (CEST) IronPort-SDR: WYAF4g1R0JB1FeAULyheoFAM61zg8WHN6rRfUbUZhNPTnbBXTm0txHxEGqV8GXwcdQc2uiX//V z+IgKDhAaSAg== X-IronPort-AV: E=McAfee;i="6200,9189,9958"; a="193157858" X-IronPort-AV: E=Sophos;i="5.82,233,1613462400"; d="scan'208";a="193157858" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Apr 2021 00:14:50 -0700 IronPort-SDR: ob0kbducw2BZMO3Anm8s6DbiIBP+Hx2mygqCYL9nDsYJMuq0JWRo59B6BqVLMEtitR8XrHslRq HNTjVObGbUnA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,233,1613462400"; d="scan'208";a="400539801" Received: from fmsmsx602.amr.corp.intel.com ([10.18.126.82]) by orsmga002.jf.intel.com with ESMTP; 19 Apr 2021 00:14:50 -0700 Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2; Mon, 19 Apr 2021 00:14:50 -0700 Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2; Mon, 19 Apr 2021 00:14:48 -0700 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2 via Frontend Transport; Mon, 19 Apr 2021 00:14:48 -0700 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.105) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2106.2; Mon, 19 Apr 2021 00:14:47 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bAk5OoBzH8afLLaMMxNRFtKmoms5H0G8IWzT0i41LAmvk5BpmG0l6dwmo3xAFq0tSc/DawOn4trW0hsr3O4FnhYfQz8LO9EwYqabedobiLyOTL1tlDkBr4axux6NcsSvwbC5sxGz1bjiYDX3wKjEmpMSQMUDqFYW1+gaohwHpBAq6ys8qXId1onBJ/C+Jqci9uEGhW7labaqickLz0nVsHySPAW372LxoXovms0rKen7ly+uMe47ukBaqb+VzNnpdFLh9EhaQX4xL0cQUdbsTWY5ZNbc3mjAPXdYvlw70mPXOQNAYl3lTZ+LejG3ueWLYYlEUrIwh2s1UlZYE7pwWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2JWTMdApKxZ41TzMztnsrfF3si12GRPDZcJftI+WS+A=; b=XZNz8f6wdpH/A7ZDyEg6CWgRA/WKBkxc8ioTO0aJjUCpI/9/KTxm13ENqy5ob/YeJIvd3BlJbD/W2PGxVdMulU3G97H+E6xLdAiJl7n/8VM5JG7wFmJF6NpYwD7Z9SfCPyyBFfTlfUOhTiu2rui9gvH6hYCuqefzdiviQgLAoJ3fOxaahw/c36PdyTLkTXO+Yque63/u/qgljbY5Y+9HuT3FcitS/gwTUMJzjgDeJFmK+WkZwn5hoI1fNoruXIYiSPB8VApBjMYDntajYYFUorkenPJnxemhwYUgRPh1T9YdjJ2c78tZROP+aWfk1QQdQtpyC45XMn5hGmsBl7YHAw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2JWTMdApKxZ41TzMztnsrfF3si12GRPDZcJftI+WS+A=; b=KWUNYcGzNcOyT/CHPj1zvsQbKKTKxcgT7nPWrUbeS9rHkvdGZOvJHHoVdYa2+zE5lyhqd2btWurUZn+OKTwIVdfy5wp9eUQMlhssSkHDc1osPNm54OnVbqxbGURrgroLiO8K+JcoWQZWyOh2DxuUAjU1h99izPY3vjEockolOAI= Received: from DM6PR11MB3898.namprd11.prod.outlook.com (2603:10b6:5:19f::12) by DM6PR11MB3897.namprd11.prod.outlook.com (2603:10b6:5:4::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.24; Mon, 19 Apr 2021 07:14:46 +0000 Received: from DM6PR11MB3898.namprd11.prod.outlook.com ([fe80::4d7c:b850:a430:8346]) by DM6PR11MB3898.namprd11.prod.outlook.com ([fe80::4d7c:b850:a430:8346%3]) with mapi id 15.20.4042.024; Mon, 19 Apr 2021 07:14:45 +0000 From: "Zhang, AlvinX" To: "Wang, Haiyue" , "Guo, Jia" CC: "dev@dpdk.org" , "stable@dpdk.org" Thread-Topic: [PATCH] net/igc: fix Rx packet size error Thread-Index: AQHXMl3fkXbkWg36pkGcyj07vzx2Saq2YuMAgAUL6FA= Date: Mon, 19 Apr 2021 07:14:45 +0000 Message-ID: References: <20210416011407.29236-1-alvinx.zhang@intel.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.55.46.56] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 18e35c78-757a-49a2-d486-08d90302cfb6 x-ms-traffictypediagnostic: DM6PR11MB3897: x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:7219; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: Czg7+ayUnWxgHlQytxfLnQ477l8e/+3GFA5lN3z9e3slsXg/7hTuuFHwmp/rgsWaxeBfV7HgkelUFL54Kfv27zlplg6wISBVjJVb4U23a32EttDhPeqpjPRBHRL3qP4yivEI2worDCkHua7YPzAqnUv5MYa3JwQTLu2fuI8RfstfBlcH1U5zlLdVMF5MVcmc4dxr3b310e7CywMMz9RpROmmQv9kbTYbmz0jSIQBD5JE/plv4VJymcrk+EpP94pFVrTCwUh6E2YcBVJJk1SWGxrMgZMf81fNjW+fioFqStfXbP1pCgDfHV/vDt9PL6xyIIkaospwAikR3gkLDYb5pbSoe5ACkBCNkmv9LU7YBkNLzdX+ScJ2Vh97hi5oI6FUjk7K8H/eBDa977kBZVdOijoYdL5RlynP+Sy7m9QjWiPkAdUGH5LRa8gXhThXrXtaFb8MglUyaJs22KWl4j4TNv12+AxOGJWovGNBoS9cFMGcKHj/we356lKnSIjSUNEzYVyyovLOA9n5Amy9OU6MQkmDMlrSGbr26++/yVsSTABKdeTXvxsjCDeEu7kR3JsekzE4pH54cAtfQF+52vCemgyA8oVqrdD7tESpO/Lv4P8= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM6PR11MB3898.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(376002)(136003)(346002)(366004)(39860400002)(396003)(66476007)(66556008)(66446008)(66946007)(64756008)(76116006)(33656002)(6506007)(83380400001)(53546011)(8936002)(8676002)(26005)(110136005)(6636002)(54906003)(186003)(55016002)(9686003)(316002)(7696005)(478600001)(86362001)(5660300002)(122000001)(38100700002)(450100002)(4326008)(71200400001)(2906002)(52536014); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata: =?us-ascii?Q?jn3b/qwIE4CPGGJZB/6ccDdQcc9vd2gc88FHr31JJkbESeFD6CV3W6IzD8YE?= =?us-ascii?Q?CaW+MUOnRFhLhgWWzVnQz/XLAJKzcl7fBziF71I+NIh4SkjLZAMYgZHTWVxW?= =?us-ascii?Q?hxZVfwBxnOt4Uy0NMP/CiY8w3jxCtWzKr5jmPY0MsHRA4wZGehMcVQaagZlg?= =?us-ascii?Q?F3/0ZMppwBk5cvDWQlKwczDlD5spKkMNPn33YvSTet8f2btjSgME98BXqgv6?= =?us-ascii?Q?3yki0pdRzkqJak7Av7KRbn2k013XUYbE3DqE/FdY6w+fFEnLN3WCgAP4LQaN?= =?us-ascii?Q?ri2JSPJwAV8W6cYSO2yJDBK2jj7N/Jxpf0N5YtB6d+7v4nlEid73JH7xV7C+?= =?us-ascii?Q?O1f9YyhMcTOrQX9xfBF90gWiXWjfvxfKlQZl5kc0UR25ANM1DIyHyFyYG4QQ?= =?us-ascii?Q?BoqXwPGZJmxXWG4PaR4MpPHKJEH7qGTNobF7sAdUysQnPPZKE62o+c7S44P/?= =?us-ascii?Q?obUuAsOieQ0QgwdhcQYF1RsjekzoM3ZasrJBObH9DK8x1G/lBZ2QMzSXsWrY?= =?us-ascii?Q?4kwTSm7mvNCRN9hEu6kSmGJHvozxNkWtN2G8jRBfe/uWmoLPCMeaZSg74WQr?= =?us-ascii?Q?4cg8DhEdUIXVK7MLT/VfRTy9iE5REl/KWw/2jvhgrBxTOei9hTCjZWRTDcVp?= =?us-ascii?Q?lF0V02GgkZItY7b6wq3Z1gb2a6Z5ov8foc3MjvP5dGDxjE73/psQ+kvOx9Vh?= =?us-ascii?Q?SjbagA//4hL6eKIAUutHEJvVuBvnZhZIc6ho7bguQPeIsQqb06vNxsSr3dIf?= =?us-ascii?Q?zf/owtwe/0ZLq/nUTmmODC3KxC0KyPMbT4kasZBlhxmogGWX2X+wAe+E/cy5?= =?us-ascii?Q?uGwRRnwgyZRvM2TQGtoNX9TMpj0aTctIXlGyw5jNQAmQOWknZgmsrckFiGSv?= =?us-ascii?Q?o7K8JN+CQaqcm0+Q6FwEuljTBqNsZz2ykiGAdgGaeBdXsB99HrJkWi7/etbZ?= =?us-ascii?Q?g4rJrfANO9Jkldtr330CbAyTc7qWIWb8qFHNRZctIS49ZTdpR2od1xN5sMvd?= =?us-ascii?Q?izhTvI8tQJVzlj4XJBRGhFGmDbwVU3hf3/3LdlbREYkIp1NzNndryAJJ4oB0?= =?us-ascii?Q?moTsDnfZ1nFfQLbCyD6LN+ngv/lL+SKCTGPPx6ZDTev56etmafyR3O+dB3DN?= =?us-ascii?Q?H7mQYGGpcON3QMbeH+G78c6Dw0sFjBEYS/PIM2/6+3dH+gDdH1v/9H1G81ls?= =?us-ascii?Q?BoltPuFVb53ZSNaT3ivf5XvZgNGXYXxEjGZt7MT6FWLtUGdRyJhWFTg8bE7V?= =?us-ascii?Q?TayGRlYRQmj2YiKg7VaPNwwma4P/qF7+isdLLwkBBxLjo5VdomdnxOqec54B?= =?us-ascii?Q?V4Y=3D?= Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM6PR11MB3898.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 18e35c78-757a-49a2-d486-08d90302cfb6 X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Apr 2021 07:14:45.8000 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: SYKnP2yHFYBq+9c6rFYqDQUKeM0WksqKVWQMVBLt6WMOJ6b6kHlboVTfIrJ/8MsVupO1v3qby0JtBf7ehH8zGA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB3897 X-OriginatorOrg: intel.com Subject: Re: [dpdk-stable] [PATCH] net/igc: fix Rx packet size error X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi Haiyue, Thanks for your review. > -----Original Message----- > From: Wang, Haiyue > Sent: Friday, April 16, 2021 9:57 AM > To: Zhang, AlvinX ; Guo, Jia > Cc: dev@dpdk.org; stable@dpdk.org > Subject: RE: [PATCH] net/igc: fix Rx packet size error >=20 > > -----Original Message----- > > From: Zhang, AlvinX > > Sent: Friday, April 16, 2021 09:14 > > To: Wang, Haiyue ; Guo, Jia > > Cc: dev@dpdk.org; Zhang, AlvinX ; > > stable@dpdk.org > > Subject: [PATCH] net/igc: fix Rx packet size error > > > > When DEV_RX_OFFLOAD_KEEP_CRC is enabled, the PMD will minus 4 bytes of > > CRC from the size of a packet, but the NIC will strip the CRC because > > the CRC strip bit in DVMOLR register is not cleared. This will cause > > the size of a packet to be 4 bytes less. > > > > This patch updates the CRC strip bit according to whether > > DEV_RX_OFFLOAD_KEEP_CRC is enabled. > > > > Fixes: a5aeb2b9e225 ("net/igc: support Rx and Tx") > > Cc: stable@dpdk.org > > > > Signed-off-by: Alvin Zhang > > --- > > drivers/net/igc/igc_txrx.c | 22 +++++++++++++--------- > > 1 file changed, 13 insertions(+), 9 deletions(-) > > > > diff --git a/drivers/net/igc/igc_txrx.c b/drivers/net/igc/igc_txrx.c > > index c0a5d5e..68b102d 100644 > > --- a/drivers/net/igc/igc_txrx.c > > +++ b/drivers/net/igc/igc_txrx.c > > @@ -1290,20 +1290,24 @@ int eth_igc_rx_descriptor_status(void *rx_queue= , > uint16_t offset) > > * This needs to be done after enable. > > */ > > for (i =3D 0; i < dev->data->nb_rx_queues; i++) { > > + uint32_t dvmolr; > > + > > rxq =3D dev->data->rx_queues[i]; > > IGC_WRITE_REG(hw, IGC_RDH(rxq->reg_idx), 0); > > - IGC_WRITE_REG(hw, IGC_RDT(rxq->reg_idx), > > - rxq->nb_rx_desc - 1); > > + IGC_WRITE_REG(hw, IGC_RDT(rxq->reg_idx), rxq->nb_rx_desc - 1); > > + > > + dvmolr =3D IGC_READ_REG(hw, IGC_DVMOLR(rxq->queue_id)); > > > > /* strip queue vlan offload */ > > - if (rxq->offloads & DEV_RX_OFFLOAD_VLAN_STRIP) { > > - uint32_t dvmolr; > > - dvmolr =3D IGC_READ_REG(hw, IGC_DVMOLR(rxq->queue_id)); > > + dvmolr =3D (rxq->offloads & DEV_RX_OFFLOAD_VLAN_STRIP) ? > > + (dvmolr | IGC_DVMOLR_STRVLAN) : > > + (dvmolr & ~IGC_DVMOLR_STRVLAN); >=20 > Just use "if ... else .."to make code readable: >=20 > if (rxq->offloads & DEV_RX_OFFLOAD_VLAN_STRIP) > dvmolr |=3D IGC_DVMOLR_STRVLAN; > else > dvmolr &=3D ~IGC_DVMOLR_STRVLAN; >=20 >=20 > > > > - /* If vlan been stripped off, the CRC is meaningless. */ >=20 > Looks like we need to handle CRC & VLAN_STRIP co-exist issue: > If user enables VLAN strip, then keep CRC should be rejected, > and vice versa. By default, the DEV_RX_OFFLOAD_KEEP_CRC does not been set, so if the user set the DEV_RX_OFFLOAD_KEEP_CRC and DEV_RX_OFFLOAD_VLAN_STRI= P bits, this means the user really need CRC and VLAN stripped off, although the CRC= is meaningless at this situation. So can we issue some warnings instead of changing the user's settings? >=20 > > - dvmolr |=3D IGC_DVMOLR_STRVLAN | IGC_DVMOLR_STRCRC; > > - IGC_WRITE_REG(hw, IGC_DVMOLR(rxq->reg_idx), dvmolr); > > - } > > + dvmolr =3D (offloads & DEV_RX_OFFLOAD_KEEP_CRC) ? > > + (dvmolr & ~IGC_DVMOLR_STRCRC) : > > + (dvmolr | IGC_DVMOLR_STRCRC); >=20 > Just use "if ... else .."to make code readable: >=20 > if (offloads & DEV_RX_OFFLOAD_KEEP_CRC) > dvmolr &=3D ~IGC_DVMOLR_STRCRC; > else > dvmolr |=3D IGC_DVMOLR_STRCRC; >=20 > > + > > + IGC_WRITE_REG(hw, IGC_DVMOLR(rxq->reg_idx), dvmolr); > > } > > > > return 0; > > -- > > 1.8.3.1