Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1135848/?format=api
{ "id": 1135848, "url": "http://patchwork.ozlabs.org/api/patches/1135848/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190723092759.3614-1-anthony.l.nguyen@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": "<20190723092759.3614-1-anthony.l.nguyen@intel.com>", "list_archive_url": null, "date": "2019-07-23T09:27:48", "name": "[S24,01/12] ice: Allow egress control packets from PF_VSI", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "2a90f4af1abad6d718b6483eba31f808da343783", "submitter": { "id": 68875, "url": "http://patchwork.ozlabs.org/api/people/68875/?format=api", "name": "Tony Nguyen", "email": "anthony.l.nguyen@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/20190723092759.3614-1-anthony.l.nguyen@intel.com/mbox/", "series": [ { "id": 121041, "url": "http://patchwork.ozlabs.org/api/series/121041/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=121041", "date": "2019-07-23T09:27:51", "name": "[S24,01/12] ice: Allow egress control packets from PF_VSI", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/121041/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1135848/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1135848/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.138; helo=whitealder.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 whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\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 45tR4524Dzz9sDQ\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 24 Jul 2019 03:56:20 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 2DF6881F20;\n\tTue, 23 Jul 2019 17:56:19 +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 8ER8BEYeehqN; Tue, 23 Jul 2019 17:56:16 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 37B6D84D6E;\n\tTue, 23 Jul 2019 17:56:16 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id 5FBAA1BF95A\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 23 Jul 2019 17:56:15 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 5B85520444\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 23 Jul 2019 17:56:15 +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 917LAzYbMZqh for <intel-wired-lan@lists.osuosl.org>;\n\tTue, 23 Jul 2019 17:56:14 +0000 (UTC)", "from mga04.intel.com (mga04.intel.com [192.55.52.120])\n\tby silver.osuosl.org (Postfix) with ESMTPS id 07A0820133\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 23 Jul 2019 17:56:14 +0000 (UTC)", "from orsmga002.jf.intel.com ([10.7.209.21])\n\tby fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t23 Jul 2019 10:56:13 -0700", "from unknown (HELO localhost.jf.intel.com) ([10.166.244.174])\n\tby orsmga002.jf.intel.com with ESMTP; 23 Jul 2019 10:56:13 -0700" ], "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.64,299,1559545200\"; d=\"scan'208\";a=\"180816341\"", "From": "Tony Nguyen <anthony.l.nguyen@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Tue, 23 Jul 2019 02:27:48 -0700", "Message-Id": "<20190723092759.3614-1-anthony.l.nguyen@intel.com>", "X-Mailer": "git-send-email 2.20.1", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH S24 01/12] ice: Allow egress control\n\tpackets from PF_VSI", "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>", "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": "From: Dave Ertman <david.m.ertman@intel.com>\n\nFor control packets (i.e. LLDP packets) to be able to egress\nfrom the main VSI, a bit has to be set in the TX_descriptor.\nThis should only be done for the main VSI and only if the\nFW LLDP agent is disabled. A bit to allow this also has to\nbe set in the VSI context.\n\nAdd the logic to add the necessary bits in the VSI context\nfor the PF_VSI and the TX_descriptors for control packets\negressing the PF_VSI.\n\nSigned-off-by: Dave Ertman <david.m.ertman@intel.com>\n---\n drivers/net/ethernet/intel/ice/ice_lib.c | 7 +++++++\n drivers/net/ethernet/intel/ice/ice_txrx.c | 11 ++++++++++-\n 2 files changed, 17 insertions(+), 1 deletion(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c\nindex a62496a74a69..6b5882c49004 100644\n--- a/drivers/net/ethernet/intel/ice/ice_lib.c\n+++ b/drivers/net/ethernet/intel/ice/ice_lib.c\n@@ -1021,6 +1021,13 @@ static int ice_vsi_init(struct ice_vsi *vsi, bool init_vsi)\n \t\t\tICE_AQ_VSI_SEC_FLAG_ENA_MAC_ANTI_SPOOF;\n \t}\n \n+\t/* Allow control frames out of main VSI */\n+\tif (vsi->type == ICE_VSI_PF) {\n+\t\tctxt->info.sec_flags |= ICE_AQ_VSI_SEC_FLAG_ALLOW_DEST_OVRD;\n+\t\tctxt->info.valid_sections |=\n+\t\t\tcpu_to_le16(ICE_AQ_VSI_PROP_SECURITY_VALID);\n+\t}\n+\n \tif (init_vsi) {\n \t\tret = ice_add_vsi(hw, vsi->idx, ctxt, NULL);\n \t\tif (ret) {\ndiff --git a/drivers/net/ethernet/intel/ice/ice_txrx.c b/drivers/net/ethernet/intel/ice/ice_txrx.c\nindex f612f1f53c67..7714c16ae689 100644\n--- a/drivers/net/ethernet/intel/ice/ice_txrx.c\n+++ b/drivers/net/ethernet/intel/ice/ice_txrx.c\n@@ -2107,6 +2107,7 @@ static netdev_tx_t\n ice_xmit_frame_ring(struct sk_buff *skb, struct ice_ring *tx_ring)\n {\n \tstruct ice_tx_offload_params offload = { 0 };\n+\tstruct ice_vsi *vsi = tx_ring->vsi;\n \tstruct ice_tx_buf *first;\n \tunsigned int count;\n \tint tso, csum;\n@@ -2154,7 +2155,15 @@ ice_xmit_frame_ring(struct sk_buff *skb, struct ice_ring *tx_ring)\n \tif (csum < 0)\n \t\tgoto out_drop;\n \n-\tif (tso || offload.cd_tunnel_params) {\n+\t/* allow CONTROL frames egress from main VSI if FW LLDP disabled */\n+\tif (unlikely(skb->priority == TC_PRIO_CONTROL &&\n+\t\t vsi->type == ICE_VSI_PF &&\n+\t\t vsi->port_info->is_sw_lldp))\n+\t\toffload.cd_qw1 |= (u64)(ICE_TX_DESC_DTYPE_CTX |\n+\t\t\t\t\tICE_TX_CTX_DESC_SWTCH_UPLINK <<\n+\t\t\t\t\tICE_TXD_CTX_QW1_CMD_S);\n+\n+\tif (offload.cd_qw1 & ICE_TX_DESC_DTYPE_CTX) {\n \t\tstruct ice_tx_ctx_desc *cdesc;\n \t\tint i = tx_ring->next_to_use;\n \n", "prefixes": [ "S24", "01/12" ] }