Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/770019/?format=api
{ "id": 770019, "url": "http://patchwork.ozlabs.org/api/patches/770019/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20170601224051.6106-13-jacob.e.keller@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": "<20170601224051.6106-13-jacob.e.keller@intel.com>", "list_archive_url": null, "date": "2017-06-01T22:40:48", "name": "[12/15] fm10k: use spinlock to implement mailbox lock", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "ecaefd1871102324d8a43816299b10fc1beb7918", "submitter": { "id": 9784, "url": "http://patchwork.ozlabs.org/api/people/9784/?format=api", "name": "Jacob Keller", "email": "jacob.e.keller@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/20170601224051.6106-13-jacob.e.keller@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/770019/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/770019/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" ], "Received": [ "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3wf2Q028B4z9sN8\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 2 Jun 2017 08:41:28 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id C7AB430C69;\n\tThu, 1 Jun 2017 22:41:26 +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 Xyi6+tl6YvJs; Thu, 1 Jun 2017 22:41:24 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id A30BD30CA5;\n\tThu, 1 Jun 2017 22:41:11 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id 45EAA1C3EBE\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 1 Jun 2017 22:40:59 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 3EAD288B37\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 1 Jun 2017 22:40:59 +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 haGQTReZYKnI for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 1 Jun 2017 22:40:57 +0000 (UTC)", "from mga14.intel.com (mga14.intel.com [192.55.52.115])\n\tby fraxinus.osuosl.org (Postfix) with ESMTPS id E99B388B3E\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 1 Jun 2017 22:40:56 +0000 (UTC)", "from fmsmga001.fm.intel.com ([10.253.24.23])\n\tby fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t01 Jun 2017 15:40:56 -0700", "from jekeller-desk.amr.corp.intel.com ([10.166.35.158])\n\tby fmsmga001.fm.intel.com with ESMTP; 01 Jun 2017 15:40:56 -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-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos; i=\"5.39,281,1493708400\"; d=\"scan'208\";\n\ta=\"1155582880\"", "From": "Jacob Keller <jacob.e.keller@intel.com>", "To": "Intel Wired LAN <intel-wired-lan@lists.osuosl.org>", "Date": "Thu, 1 Jun 2017 15:40:48 -0700", "Message-Id": "<20170601224051.6106-13-jacob.e.keller@intel.com>", "X-Mailer": "git-send-email 2.13.0.311.g0339965c70d6", "In-Reply-To": "<20170601224051.6106-1-jacob.e.keller@intel.com>", "References": "<20170601224051.6106-1-jacob.e.keller@intel.com>", "Subject": "[Intel-wired-lan] [PATCH 12/15] fm10k: use spinlock to implement\n\tmailbox lock", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.18-1", "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": "Lets not re-invent the locking wheel. Remove our bitlock and use\na proper spinlock instead.\n\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\n---\n drivers/net/ethernet/intel/fm10k/fm10k.h | 15 +++++----------\n drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 3 +++\n 2 files changed, 8 insertions(+), 10 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/fm10k/fm10k.h b/drivers/net/ethernet/intel/fm10k/fm10k.h\nindex 689c413b7782..1bcba0665ac1 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k.h\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k.h\n@@ -274,7 +274,6 @@ enum fm10k_state_t {\n \t__FM10K_SERVICE_SCHED,\n \t__FM10K_SERVICE_REQUEST,\n \t__FM10K_SERVICE_DISABLE,\n-\t__FM10K_MBX_LOCK,\n \t__FM10K_LINK_DOWN,\n \t__FM10K_UPDATING_STATS,\n \t/* This value must be last and determines the BITMAP size */\n@@ -344,6 +343,8 @@ struct fm10k_intfc {\n \n \tstruct fm10k_hw_stats stats;\n \tstruct fm10k_hw hw;\n+\t/* Mailbox lock */\n+\tspinlock_t mbx_lock;\n \tu32 __iomem *uc_addr;\n \tu32 __iomem *sw_addr;\n \tu16 msg_enable;\n@@ -384,23 +385,17 @@ struct fm10k_intfc {\n \n static inline void fm10k_mbx_lock(struct fm10k_intfc *interface)\n {\n-\t/* busy loop if we cannot obtain the lock as some calls\n-\t * such as ndo_set_rx_mode may be made in atomic context\n-\t */\n-\twhile (test_and_set_bit(__FM10K_MBX_LOCK, interface->state))\n-\t\tudelay(20);\n+\tspin_lock(&interface->mbx_lock);\n }\n \n static inline void fm10k_mbx_unlock(struct fm10k_intfc *interface)\n {\n-\t/* flush memory to make sure state is correct */\n-\tsmp_mb__before_atomic();\n-\tclear_bit(__FM10K_MBX_LOCK, interface->state);\n+\tspin_unlock(&interface->mbx_lock);\n }\n \n static inline int fm10k_mbx_trylock(struct fm10k_intfc *interface)\n {\n-\treturn !test_and_set_bit(__FM10K_MBX_LOCK, interface->state);\n+\treturn spin_trylock(&interface->mbx_lock);\n }\n \n /* fm10k_test_staterr - test bits in Rx descriptor status and error fields */\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\nindex 206da6b7c46a..17f3913e4bf7 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\n@@ -1893,6 +1893,9 @@ static int fm10k_sw_init(struct fm10k_intfc *interface,\n \tnetdev_rss_key_fill(rss_key, sizeof(rss_key));\n \tmemcpy(interface->rssrk, rss_key, sizeof(rss_key));\n \n+\t/* Initialize the mailbox lock */\n+\tspin_lock_init(&interface->mbx_lock);\n+\n \t/* Start off interface as being down */\n \tset_bit(__FM10K_DOWN, interface->state);\n \tset_bit(__FM10K_UPDATING_STATS, interface->state);\n", "prefixes": [ "12/15" ] }