linux-kernel - Re: linux-next: manual merge of the dmaengine tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <a05caaa9-244b-a84f-88b2-2d6bfec61fdd@intel.com>
Date:   Wed, 18 May 2022 15:43:08 -0700
From:   Dave Jiang <dave.jiang@...el.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Vinod Koul <vkoul@...nel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the dmaengine tree with Linus' tree


On 5/18/2022 3:40 PM, Stephen Rothwell wrote:
> Hi Dave,
>
> On Wed, 18 May 2022 10:20:59 -0700 Dave Jiang <dave.jiang@...el.com> wrote:
>> 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);
> Thanks for checking.  I have made that change to my merge resolution.
Thank you!