From nobody Wed Jan 26 22:28:17 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id C40331976068; Wed, 26 Jan 2022 22:28:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jkdf94FB2z4r14; Wed, 26 Jan 2022 22:28:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643236097; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yJ2816kyOG2oNnanMOLYEcbf73Eicz3zcU463bRC30o=; b=E9cqnEVH8vHKPA1Pp7L/cOiuDVyvdTW/4lXcRmGDwwX9GcPYXYTQYuWmUcXr4uWlkgiGly BB2GDP5Q7Xj2zdH9a5xP4BrUVVcnLcWlOl13GcBVfGQ0bUbJTrKNYESRPxSCgt/KcZ0VT3 yaPQ1VqtayPaFXyX4ONLMcwLS1hS/576nofAkqNI1RhB1wlEJwGFjx/6hokszkYByHuLQL N3/nG1KrZqOhB//zjwTw4Hwi7FvsmPmCdDlhJ1Hd3VUCKJTg/d0iPCzU087L+NbAmpVNrz IyJFtCZnRwuhQqn9e9TJZk/WR+TG6qrU2T6LrmbcKv2wQkflrZX8P+x6JF57Qg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4E8D2274E; Wed, 26 Jan 2022 22:28:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20QMSH7e054712; Wed, 26 Jan 2022 22:28:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20QMSHLf054711; Wed, 26 Jan 2022 22:28:17 GMT (envelope-from git) Date: Wed, 26 Jan 2022 22:28:17 GMT Message-Id: <202201262228.20QMSHLf054711@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: c974c22a4fd9 - main - Revert "LinuxKPI: Allow wake_up to be executed within a critical section" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c974c22a4fd997729d7b4caadb05ae6658c50e08 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643236097; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yJ2816kyOG2oNnanMOLYEcbf73Eicz3zcU463bRC30o=; b=dc8CkHfdY6EY8tH78/Vyx9bN4AwstntjF5LrN+XfQmbT56HjaZhkz3dzSaSVtReWYPBbvu 9rvwI8kff2pHgC4IVqJQRTKJZnW0a6ahXuQYeGL/TWXRuKPRL5E0o3mItIAo0LMT2c2cMY 5joJjQSmKxt5dduYuiFSXHu06YQgteG+Ij9UFGCKBo6Kxynr+3CLgZji7YJmztS/Tl8RfB Ftm5MgMX9Xy09zHQ8sby+tYxFCBwUwQ3AmB93PMYVfxvPNHGhmG+ECnyB983DGwwQx/pfz V23/MkGcD5Wpc8GxkCc6VOq0FjPTS/G5V71w0nha3xiBg+ggrWvLMC7Ld175hQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643236097; a=rsa-sha256; cv=none; b=RJFaW7iDkla5Nv1pimxxtdadtu65bA7yLEUP3O3Et9vXJ4hyeQR9chDNtUws1fSJSUOmRb fw5Qa8ntzbTXPpFFqmHeyl4AEJbTojijeARD5wkLofog/pcgzBzX9X4nG/MaJPDbF6Zikz UnwkvU4JDedwKlvwR+oF1Dpt3Maa51QRLS3xtxXHyUgTgfU34T/yOunJmRvuLQnMtGwsTP Lzl/VHfBSEDk+e7w6oAL35654RmEx0xEPbZ6Y4ChIWwm7iS6JSZhvfMvnCV/bP7pVQVUCB AzHNHLgwxvY4Ltv1li+jZJbNa6PzS5fvL6jdm9tE6z38UTupipelBS9dkAJwkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=c974c22a4fd997729d7b4caadb05ae6658c50e08 commit c974c22a4fd997729d7b4caadb05ae6658c50e08 Author: Vladimir Kondratyev AuthorDate: 2022-01-26 22:27:01 +0000 Commit: Vladimir Kondratyev CommitDate: 2022-01-26 22:27:01 +0000 Revert "LinuxKPI: Allow wake_up to be executed within a critical section" This change was based on currently reverted commit 7dea0c9e6eba. This reverts commit 89889ab470b9f1a1cd36913dd219b78efbf484df. --- sys/compat/linuxkpi/common/src/linux_schedule.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_schedule.c b/sys/compat/linuxkpi/common/src/linux_schedule.c index 02074be8eb19..656d8697d169 100644 --- a/sys/compat/linuxkpi/common/src/linux_schedule.c +++ b/sys/compat/linuxkpi/common/src/linux_schedule.c @@ -202,11 +202,9 @@ void linux_wake_up(wait_queue_head_t *wqh, unsigned int state, int nr, bool locked) { wait_queue_t *pos, *next; - unsigned long flags; if (!locked) - spin_lock_irqsave(&wqh->lock, flags); - + spin_lock(&wqh->lock); list_for_each_entry_safe(pos, next, &wqh->task_list, task_list) { if (pos->func == NULL) { if (wake_up_task(pos->private, state) != 0 && --nr == 0) @@ -217,7 +215,7 @@ linux_wake_up(wait_queue_head_t *wqh, unsigned int state, int nr, bool locked) } } if (!locked) - spin_unlock_irqrestore(&wqh->lock, flags); + spin_unlock(&wqh->lock); } void