Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/138872/?format=api
{ "id": 138872, "url": "http://patches.dpdk.org/api/patches/138872/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20240327184413.3192526-1-vladimir.medvedkin@intel.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20240327184413.3192526-1-vladimir.medvedkin@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20240327184413.3192526-1-vladimir.medvedkin@intel.com", "date": "2024-03-27T18:44:13", "name": "net/ice: fix vlan stripping in double VLAN mode", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "469a54ab7449c4168be4408ac7fcd52757bf8a79", "submitter": { "id": 1216, "url": "http://patches.dpdk.org/api/people/1216/?format=api", "name": "Vladimir Medvedkin", "email": "vladimir.medvedkin@intel.com" }, "delegate": { "id": 10, "url": "http://patches.dpdk.org/api/users/10/?format=api", "username": "bruce", "first_name": "Bruce", "last_name": "Richardson", "email": "bruce.richardson@intel.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20240327184413.3192526-1-vladimir.medvedkin@intel.com/mbox/", "series": [ { "id": 31631, "url": "http://patches.dpdk.org/api/series/31631/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=31631", "date": "2024-03-27T18:44:13", "name": "net/ice: fix vlan stripping in double VLAN mode", "version": 1, "mbox": "http://patches.dpdk.org/series/31631/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/138872/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/138872/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id EE58A43CF0;\n\tWed, 27 Mar 2024 19:44:21 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 87C88402B2;\n\tWed, 27 Mar 2024 19:44:21 +0100 (CET)", "from mgamail.intel.com (mgamail.intel.com [192.198.163.19])\n by mails.dpdk.org (Postfix) with ESMTP id 97CFA402A3;\n Wed, 27 Mar 2024 19:44:19 +0100 (CET)", "from orviesa010.jf.intel.com ([10.64.159.150])\n by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 27 Mar 2024 11:44:17 -0700", "from silpixa00400072.ir.intel.com (HELO\n silpixa00400072.ger.corp.intel.com) ([10.237.222.194])\n by orviesa010.jf.intel.com with ESMTP; 27 Mar 2024 11:44:16 -0700" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1711565060; x=1743101060;\n h=from:to:cc:subject:date:message-id:mime-version:\n content-transfer-encoding;\n bh=zPFhn4n5ID10EcQYILkk6txchmK0PZ3izKmeQSYHryg=;\n b=nyCzhj0sbKQCZRhiT1qOOa8yYG+6gYueL1/tYaLhQmmTNwC+urURIIzA\n geeEPpVGvcToH9AFF84xp92BzFrXP4xHwJ2YHGnqMGI6Bf8CvYQfnOsIo\n HRQ0uTVmKCfma9Gy4XuUfTSkpIwbuLRe7q1UfWXfXdNrdCqhfIofBpH5S\n 2bFKF04Zt2gYX03JEHXyEeY+6G0vqQh/5nNVauWGoR9nOYzOdxlrGJLws\n y1GkD1EnBqYBka5H7bcavw4McoCBR025aI/whcmqRnYCkv0aTJWfiBqzy\n YNfPn7zjaAZOQDsxTlsSkvfMciMW+hMeulihobArVfgTh7sdqkN9iMUTJ g==;", "X-CSE-ConnectionGUID": "NZ8jLzt/TmK6MmEIrWBHWw==", "X-CSE-MsgGUID": "kSYHblK/Rxy9EAta332rnA==", "X-IronPort-AV": [ "E=McAfee;i=\"6600,9927,11026\"; a=\"6553098\"", "E=Sophos;i=\"6.07,159,1708416000\";\n d=\"scan'208\";a=\"6553098\"", "E=Sophos;i=\"6.07,159,1708416000\"; d=\"scan'208\";a=\"16233068\"" ], "X-ExtLoop1": "1", "From": "Vladimir Medvedkin <vladimir.medvedkin@intel.com>", "To": "dev@dpdk.org", "Cc": "david.marchand@redhat.com, carlosmn@weg.net, mingjinx.ye@intel.com,\n stable@dpdk.org", "Subject": "[PATCH] net/ice: fix vlan stripping in double VLAN mode", "Date": "Wed, 27 Mar 2024 18:44:13 +0000", "Message-Id": "<20240327184413.3192526-1-vladimir.medvedkin@intel.com>", "X-Mailer": "git-send-email 2.34.1", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "The ICE hardware can operate in two modes - single vlan mode\nor double vlan mode. Depending on the operating mode the hardware\nhandles vlan header with single vlan tag differently.\nWhen double vlan enabled, a packet with a single VLAN is treated\nas a packet with outer VLAN only. Otherwise, a single VLAN in a\npacket is treated as inner VLAN.\n\nThis patch fixes the logic of how vlan stripping is programmed.\n\nBugzilla ID: 1402\n\nFixes: de5da9d16430 (\"net/ice: support double VLAN\")\nCc: mingjinx.ye@intel.com\nCc: stable@dpdk.org\n\nSigned-off-by: Vladimir Medvedkin <vladimir.medvedkin@intel.com>\n---\n drivers/net/ice/ice_ethdev.c | 45 +++++++++++++++++++++++++-----------\n 1 file changed, 32 insertions(+), 13 deletions(-)", "diff": "diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c\nindex 87385d2649..205c5f5f43 100644\n--- a/drivers/net/ice/ice_ethdev.c\n+++ b/drivers/net/ice/ice_ethdev.c\n@@ -3826,7 +3826,10 @@ ice_dev_start(struct rte_eth_dev *dev)\n \tice_set_tx_function(dev);\n \n \tmask = RTE_ETH_VLAN_STRIP_MASK | RTE_ETH_VLAN_FILTER_MASK |\n-\t\t\tRTE_ETH_VLAN_EXTEND_MASK | RTE_ETH_QINQ_STRIP_MASK;\n+\t\t\tRTE_ETH_VLAN_EXTEND_MASK;\n+\tif (ice_is_dvm_ena(hw))\n+\t\tmask |= RTE_ETH_QINQ_STRIP_MASK;\n+\n \tret = ice_vlan_offload_set(dev, mask);\n \tif (ret) {\n \t\tPMD_INIT_LOG(ERR, \"Unable to set VLAN offload\");\n@@ -4896,19 +4899,35 @@ ice_vlan_offload_set(struct rte_eth_dev *dev, int mask)\n \t\t\tice_vsi_config_vlan_filter(vsi, false);\n \t}\n \n-\tif (mask & RTE_ETH_VLAN_STRIP_MASK) {\n-\t\tif (rxmode->offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP)\n-\t\t\tice_vsi_config_vlan_stripping(vsi, true);\n-\t\telse\n-\t\t\tice_vsi_config_vlan_stripping(vsi, false);\n-\t}\n+\tstruct ice_hw *hw = ICE_VSI_TO_HW(vsi);\n+\tif (!ice_is_dvm_ena(hw)) {\n+\t\tif (mask & RTE_ETH_VLAN_STRIP_MASK) {\n+\t\t\tif (rxmode->offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP)\n+\t\t\t\tice_vsi_config_vlan_stripping(vsi, true);\n+\t\t\telse\n+\t\t\t\tice_vsi_config_vlan_stripping(vsi, false);\n+\t\t}\n \n-\tif (mask & RTE_ETH_QINQ_STRIP_MASK) {\n-\t\t/* Enable or disable outer VLAN stripping */\n-\t\tif (rxmode->offloads & RTE_ETH_RX_OFFLOAD_QINQ_STRIP)\n-\t\t\tice_vsi_config_outer_vlan_stripping(vsi, true);\n-\t\telse\n-\t\t\tice_vsi_config_outer_vlan_stripping(vsi, false);\n+\t\tif (mask & RTE_ETH_QINQ_STRIP_MASK) {\n+\t\t\tPMD_DRV_LOG(ERR, \"Single VLAN mode (SVM) does not support qinq\");\n+\t\t\treturn -ENOTSUP;\n+\t\t}\n+\t} else {\n+\t\tif ((mask & RTE_ETH_VLAN_STRIP_MASK) |\n+\t\t\t\t(mask & RTE_ETH_QINQ_STRIP_MASK)) {\n+\t\t\tif (rxmode->offloads & (RTE_ETH_RX_OFFLOAD_VLAN_STRIP |\n+\t\t\t\t\t\tRTE_ETH_RX_OFFLOAD_QINQ_STRIP))\n+\t\t\t\tice_vsi_config_outer_vlan_stripping(vsi, true);\n+\t\t\telse\n+\t\t\t\tice_vsi_config_outer_vlan_stripping(vsi, false);\n+\t\t}\n+\n+\t\tif (mask & RTE_ETH_QINQ_STRIP_MASK) {\n+\t\t\tif (rxmode->offloads & RTE_ETH_RX_OFFLOAD_QINQ_STRIP)\n+\t\t\t\tice_vsi_config_vlan_stripping(vsi, true);\n+\t\t\telse\n+\t\t\t\tice_vsi_config_vlan_stripping(vsi, false);\n+\t\t}\n \t}\n \n \treturn 0;\n", "prefixes": [] }