Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1041537/?format=api
{ "id": 1041537, "url": "http://patchwork.ozlabs.org/api/patches/1041537/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190213185115.25877-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": "<20190213185115.25877-8-anirudh.venkataramanan@intel.com>", "list_archive_url": null, "date": "2019-02-13T18:51:07", "name": "[S14,07/15] ice: map rx buffer pages with DMA attributes", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "6dd28a4f71785eb27973cabbb827b48c4f51c2b3", "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/20190213185115.25877-8-anirudh.venkataramanan@intel.com/mbox/", "series": [ { "id": 91786, "url": "http://patchwork.ozlabs.org/api/series/91786/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=91786", "date": "2019-02-13T18:51:02", "name": "Implementation updates for ice", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/91786/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1041537/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1041537/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.137; helo=fraxinus.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 fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\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 4407wd57FYz9s2P\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 14 Feb 2019 05:54:09 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 66C0F8523B;\n\tWed, 13 Feb 2019 18:54:07 +0000 (UTC)", "from fraxinus.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id H4ZAYGBi7S7P; Wed, 13 Feb 2019 18:54:02 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 11398854D7;\n\tWed, 13 Feb 2019 18:54:02 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id 334081BF986\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 13 Feb 2019 18:53:14 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id AB7438243D\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 13 Feb 2019 18:51:58 +0000 (UTC)", "from hemlock.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id 7BT7TUn2Xx2V for <intel-wired-lan@lists.osuosl.org>;\n\tWed, 13 Feb 2019 18:51:49 +0000 (UTC)", "from mga04.intel.com (mga04.intel.com [192.55.52.120])\n\tby hemlock.osuosl.org (Postfix) with ESMTPS id 24960868F7\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 13 Feb 2019 18:51:21 +0000 (UTC)", "from orsmga001.jf.intel.com ([10.7.209.18])\n\tby fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t13 Feb 2019 10:51:17 -0800", "from shasta.jf.intel.com ([10.166.241.11])\n\tby orsmga001.jf.intel.com with ESMTP; 13 Feb 2019 10:51:16 -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,366,1544515200\"; d=\"scan'208\";a=\"138354239\"", "From": "Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Wed, 13 Feb 2019 10:51:07 -0800", "Message-Id": "<20190213185115.25877-8-anirudh.venkataramanan@intel.com>", "X-Mailer": "git-send-email 2.14.5", "In-Reply-To": "<20190213185115.25877-1-anirudh.venkataramanan@intel.com>", "References": "<20190213185115.25877-1-anirudh.venkataramanan@intel.com>", "Subject": "[Intel-wired-lan] [PATCH S14 07/15] ice: map rx buffer pages with\n\tDMA attributes", "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": "From: Maciej Fijalkowski <maciej.fijalkowski@intel.com>\n\nProvide DMA_ATTR_WEAK_ORDERING and DMA_ATTR_SKIP_CPU_SYNC attributes to\nthe DMA API during the mapping operations on rx side. With this change\nthe non-x86 platforms will be able to sync only with what is being used\n(2k buffer) instead of entire page. This should yield a slight\nperformance improvement.\n\nFurthermore, DMA unmap may destroy the changes that were made to the\nbuffer by CPU when platform is not a x86 one. DMA_ATTR_SKIP_CPU_SYNC\nattribute usage fixes this issue.\n\nAlso add a sync_single_for_device call during the rx buffer assignment,\nto make sure that the cache lines are cleared before device attempting\nto write to the buffer.\n\nSigned-off-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>\nSigned-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>\n---\n[Anirudh Venkataramanan <anirudh.venkataramanan@intel.com> cleaned up commit message]\n---\n drivers/net/ethernet/intel/ice/ice_txrx.c | 24 ++++++++++++++++++++----\n drivers/net/ethernet/intel/ice/ice_txrx.h | 3 +++\n 2 files changed, 23 insertions(+), 4 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice_txrx.c b/drivers/net/ethernet/intel/ice/ice_txrx.c\nindex aaa29ac18cdb..2f5981dbdff9 100644\n--- a/drivers/net/ethernet/intel/ice/ice_txrx.c\n+++ b/drivers/net/ethernet/intel/ice/ice_txrx.c\n@@ -282,7 +282,16 @@ void ice_clean_rx_ring(struct ice_ring *rx_ring)\n \t\tif (!rx_buf->page)\n \t\t\tcontinue;\n \n-\t\tdma_unmap_page(dev, rx_buf->dma, PAGE_SIZE, DMA_FROM_DEVICE);\n+\t\t/* Invalidate cache lines that may have been written to by\n+\t\t * device so that we avoid corrupting memory.\n+\t\t */\n+\t\tdma_sync_single_range_for_cpu(dev, rx_buf->dma,\n+\t\t\t\t\t rx_buf->page_offset,\n+\t\t\t\t\t ICE_RXBUF_2048, DMA_FROM_DEVICE);\n+\n+\t\t/* free resources associated with mapping */\n+\t\tdma_unmap_page_attrs(dev, rx_buf->dma, PAGE_SIZE,\n+\t\t\t\t DMA_FROM_DEVICE, ICE_RX_DMA_ATTR);\n \t\t__page_frag_cache_drain(rx_buf->page, rx_buf->pagecnt_bias);\n \n \t\trx_buf->page = NULL;\n@@ -409,7 +418,8 @@ ice_alloc_mapped_page(struct ice_ring *rx_ring, struct ice_rx_buf *bi)\n \t}\n \n \t/* map page for use */\n-\tdma = dma_map_page(rx_ring->dev, page, 0, PAGE_SIZE, DMA_FROM_DEVICE);\n+\tdma = dma_map_page_attrs(rx_ring->dev, page, 0, PAGE_SIZE,\n+\t\t\t\t DMA_FROM_DEVICE, ICE_RX_DMA_ATTR);\n \n \t/* if mapping failed free memory back to system since\n \t * there isn't much point in holding memory we can't use\n@@ -454,6 +464,12 @@ bool ice_alloc_rx_bufs(struct ice_ring *rx_ring, u16 cleaned_count)\n \t\tif (!ice_alloc_mapped_page(rx_ring, bi))\n \t\t\tgoto no_bufs;\n \n+\t\t/* sync the buffer for use by the device */\n+\t\tdma_sync_single_range_for_device(rx_ring->dev, bi->dma,\n+\t\t\t\t\t\t bi->page_offset,\n+\t\t\t\t\t\t ICE_RXBUF_2048,\n+\t\t\t\t\t\t DMA_FROM_DEVICE);\n+\n \t\t/* Refresh the desc even if buffer_addrs didn't change\n \t\t * because each write-back erases this info.\n \t\t */\n@@ -726,8 +742,8 @@ static void ice_put_rx_buf(struct ice_ring *rx_ring, struct ice_rx_buf *rx_buf)\n \t\trx_ring->rx_stats.page_reuse_count++;\n \t} else {\n \t\t/* we are not reusing the buffer so unmap it */\n-\t\tdma_unmap_page(rx_ring->dev, rx_buf->dma, PAGE_SIZE,\n-\t\t\t DMA_FROM_DEVICE);\n+\t\tdma_unmap_page_attrs(rx_ring->dev, rx_buf->dma, PAGE_SIZE,\n+\t\t\t\t DMA_FROM_DEVICE, ICE_RX_DMA_ATTR);\n \t\t__page_frag_cache_drain(rx_buf->page, rx_buf->pagecnt_bias);\n \t}\n \ndiff --git a/drivers/net/ethernet/intel/ice/ice_txrx.h b/drivers/net/ethernet/intel/ice/ice_txrx.h\nindex 43b39e7ce470..bd446ed423e5 100644\n--- a/drivers/net/ethernet/intel/ice/ice_txrx.h\n+++ b/drivers/net/ethernet/intel/ice/ice_txrx.h\n@@ -47,6 +47,9 @@\n #define ICE_TX_FLAGS_VLAN_M\t0xffff0000\n #define ICE_TX_FLAGS_VLAN_S\t16\n \n+#define ICE_RX_DMA_ATTR \\\n+\t(DMA_ATTR_SKIP_CPU_SYNC | DMA_ATTR_WEAK_ORDERING)\n+\n struct ice_tx_buf {\n \tstruct ice_tx_desc *next_to_watch;\n \tstruct sk_buff *skb;\n", "prefixes": [ "S14", "07/15" ] }