{"id":814981,"url":"http://patchwork.ozlabs.org/api/patches/814981/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170918153049.44185-12-mika.westerberg@linux.intel.com/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170918153049.44185-12-mika.westerberg@linux.intel.com>","list_archive_url":null,"date":"2017-09-18T15:30:44","name":"[11/16] thunderbolt: Use spinlock in ring serialization","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":true,"hash":"4dc69e08b650047c0a8097b83df47e15c538f0e2","submitter":{"id":14534,"url":"http://patchwork.ozlabs.org/api/people/14534/?format=json","name":"Mika Westerberg","email":"mika.westerberg@linux.intel.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20170918153049.44185-12-mika.westerberg@linux.intel.com/mbox/","series":[{"id":3664,"url":"http://patchwork.ozlabs.org/api/series/3664/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=3664","date":"2017-09-18T15:30:47","name":"Thunderbolt networking","version":1,"mbox":"http://patchwork.ozlabs.org/series/3664/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/814981/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/814981/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xwqmc1Rf4z9s78\n\tfor ;\n\tTue, 19 Sep 2017 01:34:08 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1756064AbdIRPd5 (ORCPT );\n\tMon, 18 Sep 2017 11:33:57 -0400","from mga01.intel.com ([192.55.52.88]:32764 \"EHLO mga01.intel.com\"\n\trhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP\n\tid S1755417AbdIRPbC (ORCPT );\n\tMon, 18 Sep 2017 11:31:02 -0400","from fmsmga002.fm.intel.com ([10.253.24.26])\n\tby fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t18 Sep 2017 08:31:01 -0700","from black.fi.intel.com ([10.237.72.28])\n\tby fmsmga002.fm.intel.com with ESMTP; 18 Sep 2017 08:30:57 -0700","by black.fi.intel.com (Postfix, from userid 1001)\n\tid DC44E648; Mon, 18 Sep 2017 18:30:49 +0300 (EEST)"],"X-ExtLoop1":"1","X-IronPort-AV":"E=Sophos;i=\"5.42,413,1500966000\"; d=\"scan'208\";a=\"1220359574\"","From":"Mika Westerberg ","To":"Greg Kroah-Hartman ,\n\t\"David S . Miller\" ","Cc":"Andreas Noever ,\n\tMichael Jamet ,\n\tYehezkel Bernat ,\n\tAmir Levy ,\n\tMario.Limonciello@dell.com, Lukas Wunner ,\n\tAndy Shevchenko ,\n\tMika Westerberg ,\n\tlinux-kernel@vger.kernel.org, netdev@vger.kernel.org","Subject":"[PATCH 11/16] thunderbolt: Use spinlock in ring serialization","Date":"Mon, 18 Sep 2017 18:30:44 +0300","Message-Id":"<20170918153049.44185-12-mika.westerberg@linux.intel.com>","X-Mailer":"git-send-email 2.14.1","In-Reply-To":"<20170918153049.44185-1-mika.westerberg@linux.intel.com>","References":"<20170918153049.44185-1-mika.westerberg@linux.intel.com>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"This makes it possible to enqueue frames also from atomic context which\nis needed for example, when networking packets are sent over a\nThunderbolt cable.\n\nSigned-off-by: Mika Westerberg \nReviewed-by: Michael Jamet \nReviewed-by: Yehezkel Bernat \n---\n drivers/thunderbolt/nhi.c | 26 ++++++++++++++------------\n include/linux/thunderbolt.h | 2 +-\n 2 files changed, 15 insertions(+), 13 deletions(-)","diff":"diff --git a/drivers/thunderbolt/nhi.c b/drivers/thunderbolt/nhi.c\nindex 4704ccd20c84..d1ad37c6eccf 100644\n--- a/drivers/thunderbolt/nhi.c\n+++ b/drivers/thunderbolt/nhi.c\n@@ -212,8 +212,10 @@ static void ring_work(struct work_struct *work)\n \tstruct tb_ring *ring = container_of(work, typeof(*ring), work);\n \tstruct ring_frame *frame;\n \tbool canceled = false;\n+\tunsigned long flags;\n \tLIST_HEAD(done);\n-\tmutex_lock(&ring->lock);\n+\n+\tspin_lock_irqsave(&ring->lock, flags);\n \n \tif (!ring->running) {\n \t\t/* Move all frames to done and mark them as canceled. */\n@@ -241,7 +243,8 @@ static void ring_work(struct work_struct *work)\n \tring_write_descriptors(ring);\n \n invoke_callback:\n-\tmutex_unlock(&ring->lock); /* allow callbacks to schedule new work */\n+\t/* allow callbacks to schedule new work */\n+\tspin_unlock_irqrestore(&ring->lock, flags);\n \twhile (!list_empty(&done)) {\n \t\tframe = list_first_entry(&done, typeof(*frame), list);\n \t\t/*\n@@ -255,15 +258,17 @@ static void ring_work(struct work_struct *work)\n \n int __tb_ring_enqueue(struct tb_ring *ring, struct ring_frame *frame)\n {\n+\tunsigned long flags;\n \tint ret = 0;\n-\tmutex_lock(&ring->lock);\n+\n+\tspin_lock_irqsave(&ring->lock, flags);\n \tif (ring->running) {\n \t\tlist_add_tail(&frame->list, &ring->queue);\n \t\tring_write_descriptors(ring);\n \t} else {\n \t\tret = -ESHUTDOWN;\n \t}\n-\tmutex_unlock(&ring->lock);\n+\tspin_unlock_irqrestore(&ring->lock, flags);\n \treturn ret;\n }\n EXPORT_SYMBOL_GPL(__tb_ring_enqueue);\n@@ -338,7 +343,7 @@ static struct tb_ring *tb_ring_alloc(struct tb_nhi *nhi, u32 hop, int size,\n \tif (!ring)\n \t\tgoto err;\n \n-\tmutex_init(&ring->lock);\n+\tspin_lock_init(&ring->lock);\n \tINIT_LIST_HEAD(&ring->queue);\n \tINIT_LIST_HEAD(&ring->in_flight);\n \tINIT_WORK(&ring->work, ring_work);\n@@ -371,8 +376,6 @@ static struct tb_ring *tb_ring_alloc(struct tb_nhi *nhi, u32 hop, int size,\n \treturn ring;\n \n err:\n-\tif (ring)\n-\t\tmutex_destroy(&ring->lock);\n \tkfree(ring);\n \tmutex_unlock(&nhi->lock);\n \treturn NULL;\n@@ -419,7 +422,7 @@ void tb_ring_start(struct tb_ring *ring)\n \tu32 flags;\n \n \tmutex_lock(&ring->nhi->lock);\n-\tmutex_lock(&ring->lock);\n+\tspin_lock_irq(&ring->lock);\n \tif (ring->nhi->going_away)\n \t\tgoto err;\n \tif (ring->running) {\n@@ -466,7 +469,7 @@ void tb_ring_start(struct tb_ring *ring)\n \tring_interrupt_active(ring, true);\n \tring->running = true;\n err:\n-\tmutex_unlock(&ring->lock);\n+\tspin_unlock_irq(&ring->lock);\n \tmutex_unlock(&ring->nhi->lock);\n }\n EXPORT_SYMBOL_GPL(tb_ring_start);\n@@ -487,7 +490,7 @@ EXPORT_SYMBOL_GPL(tb_ring_start);\n void tb_ring_stop(struct tb_ring *ring)\n {\n \tmutex_lock(&ring->nhi->lock);\n-\tmutex_lock(&ring->lock);\n+\tspin_lock_irq(&ring->lock);\n \tdev_info(&ring->nhi->pdev->dev, \"stopping %s %d\\n\",\n \t\t RING_TYPE(ring), ring->hop);\n \tif (ring->nhi->going_away)\n@@ -508,7 +511,7 @@ void tb_ring_stop(struct tb_ring *ring)\n \tring->running = false;\n \n err:\n-\tmutex_unlock(&ring->lock);\n+\tspin_unlock_irq(&ring->lock);\n \tmutex_unlock(&ring->nhi->lock);\n \n \t/*\n@@ -568,7 +571,6 @@ void tb_ring_free(struct tb_ring *ring)\n \t * to finish before freeing the ring.\n \t */\n \tflush_work(&ring->work);\n-\tmutex_destroy(&ring->lock);\n \tkfree(ring);\n }\n EXPORT_SYMBOL_GPL(tb_ring_free);\ndiff --git a/include/linux/thunderbolt.h b/include/linux/thunderbolt.h\nindex fac4ff62c0de..51af0a5fa52f 100644\n--- a/include/linux/thunderbolt.h\n+++ b/include/linux/thunderbolt.h\n@@ -448,7 +448,7 @@ struct tb_nhi {\n * @eof_mask: Bit mask used to detect end of frame PDF\n */\n struct tb_ring {\n-\tstruct mutex lock;\n+\tspinlock_t lock;\n \tstruct tb_nhi *nhi;\n \tint size;\n \tint hop;\n","prefixes":["11/16"]}