From: Dave Jiang <dave.jiang@intel.com>
To: Vinod Koul <vkoul@kernel.org>, Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the dmaengine tree with Linus' tree
Date: Wed, 18 May 2022 10:20:59 -0700 [thread overview]
Message-ID: <a6df0b8a-dc42-51e4-4b7b-62d1d11c7800@intel.com> (raw)
In-Reply-To: <YoTcmqygoMm/gmsZ@matsya>
On 5/18/2022 4:46 AM, Vinod Koul wrote:
> On 17-05-22, 15:34, Stephen Rothwell wrote:
>> Hi all,
>>
>> Today's linux-next merge of the dmaengine tree got a conflict in:
>>
>> drivers/dma/idxd/device.c
>>
>> between commit:
>>
>> 1cd8e751d96c ("dmaengine: idxd: skip clearing device context when device is read-only")
>>
>> from Linus' tree and commit:
>>
>> cf4ac3fef338 ("dmaengine: idxd: fix lockdep warning on device driver removal")
> Thank you Stephen, the merge looks right to me. Dave pls verify and test
> -next
>
>> from the dmaengine tree.
>>
>> I fixed it up (see below) and can carry the fix as necessary. This
>> is now fixed as far as linux-next is concerned, but any non trivial
>> conflicts should be mentioned to your upstream maintainer when your tree
>> is submitted for merging. You may also want to consider cooperating
>> with the maintainer of the conflicting tree to minimise any particularly
>> complex conflicts.
>>
>> --
>> Cheers,
>> Stephen Rothwell
>>
>> diff --cc drivers/dma/idxd/device.c
>> index f652da6ab47d,1143886f4a80..000000000000
>> --- a/drivers/dma/idxd/device.c
>> +++ b/drivers/dma/idxd/device.c
>> @@@ -699,21 -716,23 +716,26 @@@ static void idxd_device_wqs_clear_state
>> struct idxd_wq *wq = idxd->wqs[i];
>>
>> if (wq->state == IDXD_WQ_ENABLED) {
>> + mutex_lock(&wq->wq_lock);
>> idxd_wq_disable_cleanup(wq);
>> - idxd_wq_device_reset_cleanup(wq);
>> wq->state = IDXD_WQ_DISABLED;
>> + mutex_unlock(&wq->wq_lock);
>> }
>> + idxd_wq_device_reset_cleanup(wq);
The lock needs to go around both functions, we can move it outside the
if().
+ mutex_lock(&wq->wq_lock);
if (wq->state == IDXD_WQ_ENABLED) {
idxd_wq_disable_cleanup(wq);
- idxd_wq_device_reset_cleanup(wq);
wq->state = IDXD_WQ_DISABLED;
}
+ idxd_wq_device_reset_cleanup(wq);
+ mutex_unlock(&wq->wq_lock);
>> }
>> }
>>
>> void idxd_device_clear_state(struct idxd_device *idxd)
>> {
>> + if (!test_bit(IDXD_FLAG_CONFIGURABLE, &idxd->flags))
>> + return;
>> +
>> + idxd_device_wqs_clear_state(idxd);
>> + spin_lock(&idxd->dev_lock);
>> idxd_groups_clear_state(idxd);
>> idxd_engines_clear_state(idxd);
>> - idxd_device_wqs_clear_state(idxd);
>> + idxd->state = IDXD_DEV_DISABLED;
>> + spin_unlock(&idxd->dev_lock);
>> }
>>
>> static void idxd_group_config_write(struct idxd_group *group)
>
>
next prev parent reply other threads:[~2022-05-18 17:45 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-17 5:34 linux-next: manual merge of the dmaengine tree with Linus' tree Stephen Rothwell
2022-05-18 11:46 ` Vinod Koul
2022-05-18 17:20 ` Dave Jiang [this message]
2022-05-18 22:40 ` Stephen Rothwell
2022-05-18 22:43 ` Dave Jiang
2023-08-22 5:13 Stephen Rothwell
2023-08-22 13:59 ` Vinod Koul
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=a6df0b8a-dc42-51e4-4b7b-62d1d11c7800@intel.com \
--to=dave.jiang@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=vkoul@kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).