public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Alexander Shishkin <alexander.shishkin@linux.intel.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>,
	linux-kernel@vger.kernel.org, Zhi Jin <zhi.jin@intel.com>,
	Alexander Shishkin <alexander.shishkin@linux.intel.com>
Subject: [GIT PULL 6/7] stm class: Fix an endless loop in channel allocation
Date: Thu, 21 Feb 2019 15:49:58 +0200	[thread overview]
Message-ID: <20190221134959.15121-7-alexander.shishkin@linux.intel.com> (raw)
In-Reply-To: <20190221134959.15121-1-alexander.shishkin@linux.intel.com>

From: Zhi Jin <zhi.jin@intel.com>

There is a bug in the channel allocation logic that leads to an endless
loop when looking for a contiguous range of channels in a range with a
mixture of free and occupied channels. For example, opening three
consequtive channels, closing the first two and requesting 4 channels in
a row will trigger this soft lockup. The bug is that the search loop
forgets to skip over the range once it detects that one channel in that
range is occupied.

Restore the original intent to the logic by fixing the omission.

Fixes: 7bd1d4093c2f ("stm class: Introduce an abstraction for System Trace Module devices")
Signed-off-by: Zhi Jin <zhi.jin@intel.com>
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
---
 drivers/hwtracing/stm/core.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/hwtracing/stm/core.c b/drivers/hwtracing/stm/core.c
index 93ce3aa740a9..c80b064224f6 100644
--- a/drivers/hwtracing/stm/core.c
+++ b/drivers/hwtracing/stm/core.c
@@ -244,6 +244,9 @@ static int find_free_channels(unsigned long *bitmap, unsigned int start,
 			;
 		if (i == width)
 			return pos;
+
+		/* step over [pos..pos+i) to continue search */
+		pos += i;
 	}
 
 	return -1;
-- 
2.20.1


  parent reply	other threads:[~2019-02-21 13:50 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-21 13:49 [GIT PULL 0/7] stm class/intel_th: Updates for v5.1 Alexander Shishkin
2019-02-21 13:49 ` [GIT PULL 1/7] intel_th: Update ABI documentation Alexander Shishkin
2019-02-21 13:49 ` [GIT PULL 2/7] intel_th: Mark expected switch fall-throughs Alexander Shishkin
2019-02-21 13:49 ` [GIT PULL 3/7] intel_th: Only create useful device nodes Alexander Shishkin
2019-02-21 13:49 ` [GIT PULL 4/7] intel_th: pti: Use sysfs_match_string() helper Alexander Shishkin
2019-02-21 13:49 ` [GIT PULL 5/7] intel_th: Don't reference unassigned outputs Alexander Shishkin
2019-02-21 14:41   ` Greg Kroah-Hartman
2019-02-21 13:49 ` Alexander Shishkin [this message]
2019-02-21 14:42   ` [GIT PULL 6/7] stm class: Fix an endless loop in channel allocation Greg Kroah-Hartman
2019-02-21 13:49 ` [GIT PULL 7/7] stm class: Prevent division by zero Alexander Shishkin
2019-02-21 14:42   ` Greg Kroah-Hartman
2019-02-21 14:52     ` Alexander Shishkin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190221134959.15121-7-alexander.shishkin@linux.intel.com \
    --to=alexander.shishkin@linux.intel.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mathieu.poirier@linaro.org \
    --cc=zhi.jin@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox