Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1040455/?format=api
{ "id": 1040455, "url": "http://patchwork.ozlabs.org/api/patches/1040455/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190212085205.7848-2-bjorn.topel@gmail.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": "<20190212085205.7848-2-bjorn.topel@gmail.com>", "list_archive_url": null, "date": "2019-02-12T08:52:04", "name": "[1/2] i40e: move i40e_xsk_umem function", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "1e48896066d7e2209bbcddd2a25b69dcdb1123e3", "submitter": { "id": 70569, "url": "http://patchwork.ozlabs.org/api/people/70569/?format=api", "name": "Björn Töpel", "email": "bjorn.topel@gmail.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/20190212085205.7848-2-bjorn.topel@gmail.com/mbox/", "series": [ { "id": 91409, "url": "http://patchwork.ozlabs.org/api/series/91409/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=91409", "date": "2019-02-12T08:52:03", "name": "i40e: fix regression that enables AF_XDP ZC unconditionally", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/91409/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1040455/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1040455/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=gmail.com", "ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"Hv+oBV37\"; dkim-atps=neutral" ], "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 43zGfR0ZwFz9sMl\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 12 Feb 2019 19:53:51 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 9C93084B08;\n\tTue, 12 Feb 2019 08:53:49 +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 1_-i3TYy89Js; Tue, 12 Feb 2019 08:53:39 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id EB72D858FB;\n\tTue, 12 Feb 2019 08:53:28 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id E46AD1BF964\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 12 Feb 2019 08:52:34 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id E10A722794\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 12 Feb 2019 08:52:34 +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 IbrOJTAmujjc for <intel-wired-lan@lists.osuosl.org>;\n\tTue, 12 Feb 2019 08:52:34 +0000 (UTC)", "from mail-pf1-f194.google.com (mail-pf1-f194.google.com\n\t[209.85.210.194])\n\tby silver.osuosl.org (Postfix) with ESMTPS id 303EB2263E\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 12 Feb 2019 08:52:34 +0000 (UTC)", "by mail-pf1-f194.google.com with SMTP id z15so241588pfa.2\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 12 Feb 2019 00:52:34 -0800 (PST)", "from btopel-mobl.ger.intel.com ([134.134.139.83])\n\tby smtp.gmail.com with ESMTPSA id\n\tu73sm24461606pfa.169.2019.02.12.00.52.30\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tTue, 12 Feb 2019 00:52:33 -0800 (PST)" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=2BpwbKu37r4ICnJFpO01tcc8bs7Y4w/gT82xHbJR6nE=;\n\tb=Hv+oBV37sFyZRwsaM/K+qfnkEv9JTCqCQldESCX9sfi1UILd+lQDwh0ZJYi+GSfdKM\n\tAjB/utikFbjt7M0n0/DWVttdRqrJ6CSw5+i4hm0AgN7D1mtFVp7xdU99JWvVGjgbweig\n\tq3Ys23M6Z6r6CdffGn6COOVOAJ2/xefAsV2CILymKqr2NPEdakyNgWfwMZczVe02rH8W\n\t81oWomvO6lJ+mPj+3MiVEBXwpbaPv5hzNXPQRVz1DNfwMGQUD15ZOs8Jgy/iMfIRTZos\n\tU2nywZ0IfLvD6gqLdiJKeJQ/QPOcjsegLr8p8bEq00raxngI+uF+uPdO5lHXfYMrvDsn\n\tpVrg==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=2BpwbKu37r4ICnJFpO01tcc8bs7Y4w/gT82xHbJR6nE=;\n\tb=aOtqwzRFOETne5bD3sUL2PJ66FxvvmksT1In+TMMDh2cX5cYsZjbFhsgGjMG4COqUh\n\t/ELcgagRoMQ8wkbsDSJ/LVsoF5WmYVzPcsoJ6QNiKJd9jmslAMknryDD07JL6iOVllTD\n\tZauRJap/lQm1/l5D34JYZCk+qBjIBplxRO3k0voKETQk3A3RD+ZvG7Bt3P0bDAj7PP8a\n\t7f4yqIdjm7x/90hmO6R2VuGwdYSYKezyzah/Zdm3/sUO6PEis4Ge2t+4nezoDb/KwWXB\n\tk9y06lq4nOMVAvFlWrpfpnAsGDTivrVW4UJwgrpMw2wCmCOCD5T3f/VVNP90i3oMdFBN\n\tFk8Q==", "X-Gm-Message-State": "AHQUAuZkOwOCvPS9gfa0HnyhE6PerKsfao3WSgDNm1iGCrEO2KPfde5v\n\tpj2UDDSW2CE50Cq98mg5eSdLW7G8HmuMjA==", "X-Google-Smtp-Source": "AHgI3IYaLRItC9NcP5n4GOF6YSA0x3A/OyOt+WRZvUOKJzY4Y6lMu3XG+u4IHZt6ES5sM5WgQvueEA==", "X-Received": "by 2002:a62:569b:: with SMTP id\n\th27mr2815161pfj.163.1549961553643; \n\tTue, 12 Feb 2019 00:52:33 -0800 (PST)", "From": "=?utf-8?b?QmrDtnJuIFTDtnBlbA==?= <bjorn.topel@gmail.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Tue, 12 Feb 2019 09:52:04 +0100", "Message-Id": "<20190212085205.7848-2-bjorn.topel@gmail.com>", "X-Mailer": "git-send-email 2.19.1", "In-Reply-To": "<20190212085205.7848-1-bjorn.topel@gmail.com>", "References": "<20190212085205.7848-1-bjorn.topel@gmail.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH 1/2] i40e: move i40e_xsk_umem function", "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>", "Cc": "netdev@vger.kernel.org, =?utf-8?b?QmrDtnJuIFTDtnBlbA==?=\n\t<bjorn.topel@intel.com>, magnus.karlsson@intel.com", "Content-Type": "text/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "base64", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "From: Björn Töpel <bjorn.topel@intel.com>\n\nThe i40e_xsk_umem function was explicitly inlined in i40e.h. There is\nno reason for that, so move it to i40e_main.c instead.\n\nSigned-off-by: Björn Töpel <bjorn.topel@intel.com>\n---\n drivers/net/ethernet/intel/i40e/i40e.h | 14 --------------\n drivers/net/ethernet/intel/i40e/i40e_main.c | 20 ++++++++++++++++++++\n 2 files changed, 20 insertions(+), 14 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h\nindex d684998ba2b0..cc583ad5236b 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e.h\n@@ -1096,20 +1096,6 @@ static inline bool i40e_enabled_xdp_vsi(struct i40e_vsi *vsi)\n \treturn !!vsi->xdp_prog;\n }\n \n-static inline struct xdp_umem *i40e_xsk_umem(struct i40e_ring *ring)\n-{\n-\tbool xdp_on = i40e_enabled_xdp_vsi(ring->vsi);\n-\tint qid = ring->queue_index;\n-\n-\tif (ring_is_xdp(ring))\n-\t\tqid -= ring->vsi->alloc_queue_pairs;\n-\n-\tif (!xdp_on)\n-\t\treturn NULL;\n-\n-\treturn xdp_get_umem_from_qid(ring->vsi->netdev, qid);\n-}\n-\n int i40e_create_queue_channel(struct i40e_vsi *vsi, struct i40e_channel *ch);\n int i40e_set_bw_limit(struct i40e_vsi *vsi, u16 seid, u64 max_tx_rate);\n int i40e_add_del_cloud_filter(struct i40e_vsi *vsi,\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex 44856a84738d..ba1a84a2c8e5 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -3063,6 +3063,26 @@ static void i40e_config_xps_tx_ring(struct i40e_ring *ring)\n \t\t\t ring->queue_index);\n }\n \n+/**\n+ * i40e_xsk_umem - Retrieve the AF_XDP ZC if XDP and ZC is enabled\n+ * @ring: The Tx or Rx ring\n+ *\n+ * Returns the UMEM or NULL.\n+ **/\n+static struct xdp_umem *i40e_xsk_umem(struct i40e_ring *ring)\n+{\n+\tbool xdp_on = i40e_enabled_xdp_vsi(ring->vsi);\n+\tint qid = ring->queue_index;\n+\n+\tif (ring_is_xdp(ring))\n+\t\tqid -= ring->vsi->alloc_queue_pairs;\n+\n+\tif (!xdp_on)\n+\t\treturn NULL;\n+\n+\treturn xdp_get_umem_from_qid(ring->vsi->netdev, qid);\n+}\n+\n /**\n * i40e_configure_tx_ring - Configure a transmit ring context and rest\n * @ring: The Tx ring to configure\n", "prefixes": [ "1/2" ] }