Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1049836/?format=api
{ "id": 1049836, "url": "http://patchwork.ozlabs.org/api/patches/1049836/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190228232432.31659-8-anirudh.venkataramanan@intel.com/", "project": { "id": 46, "url": "http://patchwork.ozlabs.org/api/projects/46/?format=api", "name": "Intel Wired Ethernet development", "link_name": "intel-wired-lan", "list_id": "intel-wired-lan.osuosl.org", "list_email": "intel-wired-lan@osuosl.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20190228232432.31659-8-anirudh.venkataramanan@intel.com>", "list_archive_url": null, "date": "2019-02-28T23:24:28", "name": "[S16,07/11] ice: Add priority information into VLAN header", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "0b2dcca5997320096cdb0cc4f314230559bd48be", "submitter": { "id": 73601, "url": "http://patchwork.ozlabs.org/api/people/73601/?format=api", "name": "Anirudh Venkataramanan", "email": "anirudh.venkataramanan@intel.com" }, "delegate": { "id": 68, "url": "http://patchwork.ozlabs.org/api/users/68/?format=api", "username": "jtkirshe", "first_name": "Jeff", "last_name": "Kirsher", "email": "jeffrey.t.kirsher@intel.com" }, "mbox": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190228232432.31659-8-anirudh.venkataramanan@intel.com/mbox/", "series": [ { "id": 94826, "url": "http://patchwork.ozlabs.org/api/series/94826/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=94826", "date": "2019-02-28T23:24:25", "name": "Add support for Data Center Bridging (DCB)", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/94826/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1049836/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1049836/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@osuosl.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Authentication-Results": [ "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=osuosl.org\n\t(client-ip=140.211.166.136; helo=silver.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdmarc=fail (p=none dis=none) header.from=intel.com" ], "Received": [ "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 449TCw6qB4z9s70\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 1 Mar 2019 10:24:44 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 9501D2202E;\n\tThu, 28 Feb 2019 23:24:43 +0000 (UTC)", "from silver.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id pE3N2dWi7EzY; Thu, 28 Feb 2019 23:24:40 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id BA0C921563;\n\tThu, 28 Feb 2019 23:24:40 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id 1B6461BF410\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 28 Feb 2019 23:24:37 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 18B4B86ACE\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 28 Feb 2019 23:24:37 +0000 (UTC)", "from whitealder.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id XyfUBrJWZExG for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 28 Feb 2019 23:24:35 +0000 (UTC)", "from mga04.intel.com (mga04.intel.com [192.55.52.120])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id E1447863FD\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 28 Feb 2019 23:24:34 +0000 (UTC)", "from fmsmga003.fm.intel.com ([10.253.24.29])\n\tby fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t28 Feb 2019 15:24:34 -0800", "from shasta.jf.intel.com ([10.166.241.11])\n\tby FMSMGA003.fm.intel.com with ESMTP; 28 Feb 2019 15:24:34 -0800" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.58,425,1544515200\"; d=\"scan'208\";a=\"137127726\"", "From": "Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Thu, 28 Feb 2019 15:24:28 -0800", "Message-Id": "<20190228232432.31659-8-anirudh.venkataramanan@intel.com>", "X-Mailer": "git-send-email 2.14.5", "In-Reply-To": "<20190228232432.31659-1-anirudh.venkataramanan@intel.com>", "References": "<20190228232432.31659-1-anirudh.venkataramanan@intel.com>", "Subject": "[Intel-wired-lan] [PATCH S16 07/11] ice: Add priority information\n\tinto VLAN header", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@osuosl.org?subject=help>", "List-Subscribe": "<https://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "This patch introduces a new function ice_tx_prepare_vlan_flags_dcb to\ninsert 802.1p priority information into the VLAN header\n\nSigned-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>\n---\n drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 39 ++++++++++++++++++++++++++++\n drivers/net/ethernet/intel/ice/ice_dcb_lib.h | 10 +++++++\n drivers/net/ethernet/intel/ice/ice_txrx.c | 6 ++---\n drivers/net/ethernet/intel/ice/ice_txrx.h | 2 ++\n 4 files changed, 54 insertions(+), 3 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice_dcb_lib.c b/drivers/net/ethernet/intel/ice/ice_dcb_lib.c\nindex 68df3d78a534..fe4765483040 100644\n--- a/drivers/net/ethernet/intel/ice/ice_dcb_lib.c\n+++ b/drivers/net/ethernet/intel/ice/ice_dcb_lib.c\n@@ -359,6 +359,45 @@ int ice_init_pf_dcb(struct ice_pf *pf)\n \treturn err;\n }\n \n+/**\n+ * ice_tx_prepare_vlan_flags_dcb - prepare VLAN tagging for DCB\n+ * @tx_ring: ring to send buffer on\n+ * @first: pointer to struct ice_tx_buf\n+ */\n+int\n+ice_tx_prepare_vlan_flags_dcb(struct ice_ring *tx_ring,\n+\t\t\t struct ice_tx_buf *first)\n+{\n+\tstruct sk_buff *skb = first->skb;\n+\n+\tif (!test_bit(ICE_FLAG_DCB_ENA, tx_ring->vsi->back->flags))\n+\t\treturn 0;\n+\n+\t/* Insert 802.1p priority into VLAN header */\n+\tif ((first->tx_flags & (ICE_TX_FLAGS_HW_VLAN | ICE_TX_FLAGS_SW_VLAN)) ||\n+\t skb->priority != TC_PRIO_CONTROL) {\n+\t\tfirst->tx_flags &= ~ICE_TX_FLAGS_VLAN_PR_M;\n+\t\t/* Mask the lower 3 bits to set the 802.1p priority */\n+\t\tfirst->tx_flags |= (skb->priority & 0x7) <<\n+\t\t\t\t ICE_TX_FLAGS_VLAN_PR_S;\n+\t\tif (first->tx_flags & ICE_TX_FLAGS_SW_VLAN) {\n+\t\t\tstruct vlan_ethhdr *vhdr;\n+\t\t\tint rc;\n+\n+\t\t\trc = skb_cow_head(skb, 0);\n+\t\t\tif (rc < 0)\n+\t\t\t\treturn rc;\n+\t\t\tvhdr = (struct vlan_ethhdr *)skb->data;\n+\t\t\tvhdr->h_vlan_TCI = htons(first->tx_flags >>\n+\t\t\t\t\t\t ICE_TX_FLAGS_VLAN_S);\n+\t\t} else {\n+\t\t\tfirst->tx_flags |= ICE_TX_FLAGS_HW_VLAN;\n+\t\t}\n+\t}\n+\n+\treturn 0;\n+}\n+\n /**\n * ice_dcb_process_lldp_set_mib_change - Process MIB change\n * @pf: ptr to ice_pf\ndiff --git a/drivers/net/ethernet/intel/ice/ice_dcb_lib.h b/drivers/net/ethernet/intel/ice/ice_dcb_lib.h\nindex 449e3735ca1b..1a430a45acf7 100644\n--- a/drivers/net/ethernet/intel/ice/ice_dcb_lib.h\n+++ b/drivers/net/ethernet/intel/ice/ice_dcb_lib.h\n@@ -12,6 +12,9 @@ u8 ice_dcb_get_ena_tc(struct ice_dcbx_cfg *dcbcfg);\n u8 ice_dcb_get_num_tc(struct ice_dcbx_cfg *dcbcfg);\n void ice_vsi_cfg_dcb_rings(struct ice_vsi *vsi);\n int ice_init_pf_dcb(struct ice_pf *pf);\n+int\n+ice_tx_prepare_vlan_flags_dcb(struct ice_ring *tx_ring,\n+\t\t\t struct ice_tx_buf *first);\n void\n ice_dcb_process_lldp_set_mib_change(struct ice_pf *pf,\n \t\t\t\t struct ice_rq_event_info *event);\n@@ -37,6 +40,13 @@ static inline int ice_init_pf_dcb(struct ice_pf *pf)\n \treturn -EOPNOTSUPP;\n }\n \n+static inline int\n+ice_tx_prepare_vlan_flags_dcb(struct ice_ring __always_unused *tx_ring,\n+\t\t\t struct ice_tx_buf __always_unused *first)\n+{\n+\treturn 0;\n+}\n+\n #define ice_vsi_cfg_dcb_rings(vsi) do {} while (0)\n #define ice_dcb_process_lldp_set_mib_change(pf, event) do {} while (0)\n #define ice_set_cgd_num(tlan_ctx, ring) do {} while (0)\ndiff --git a/drivers/net/ethernet/intel/ice/ice_txrx.c b/drivers/net/ethernet/intel/ice/ice_txrx.c\nindex 35ac0b84a6b4..4b08cb3be28e 100644\n--- a/drivers/net/ethernet/intel/ice/ice_txrx.c\n+++ b/drivers/net/ethernet/intel/ice/ice_txrx.c\n@@ -6,6 +6,7 @@\n #include <linux/prefetch.h>\n #include <linux/mm.h>\n #include \"ice.h\"\n+#include \"ice_dcb_lib.h\"\n \n #define ICE_RX_HDR_SIZE\t\t256\n \n@@ -1798,7 +1799,7 @@ ice_tx_prepare_vlan_flags(struct ice_ring *tx_ring, struct ice_tx_buf *first)\n \t\t * to the encapsulated ethertype.\n \t\t */\n \t\tskb->protocol = vlan_get_protocol(skb);\n-\t\tgoto out;\n+\t\treturn 0;\n \t}\n \n \t/* if we have a HW VLAN tag being added, default to the HW one */\n@@ -1820,8 +1821,7 @@ ice_tx_prepare_vlan_flags(struct ice_ring *tx_ring, struct ice_tx_buf *first)\n \t\tfirst->tx_flags |= ICE_TX_FLAGS_SW_VLAN;\n \t}\n \n-out:\n-\treturn 0;\n+\treturn ice_tx_prepare_vlan_flags_dcb(tx_ring, first);\n }\n \n /**\ndiff --git a/drivers/net/ethernet/intel/ice/ice_txrx.h b/drivers/net/ethernet/intel/ice/ice_txrx.h\nindex 53903f846834..c75d9fd12a68 100644\n--- a/drivers/net/ethernet/intel/ice/ice_txrx.h\n+++ b/drivers/net/ethernet/intel/ice/ice_txrx.h\n@@ -45,6 +45,8 @@\n #define ICE_TX_FLAGS_HW_VLAN\tBIT(1)\n #define ICE_TX_FLAGS_SW_VLAN\tBIT(2)\n #define ICE_TX_FLAGS_VLAN_M\t0xffff0000\n+#define ICE_TX_FLAGS_VLAN_PR_M\t0xe0000000\n+#define ICE_TX_FLAGS_VLAN_PR_S\t29\n #define ICE_TX_FLAGS_VLAN_S\t16\n \n #define ICE_RX_DMA_ATTR \\\n", "prefixes": [ "S16", "07/11" ] }