From nobody Tue May 17 12:11:32 2022 X-Original-To: dev-commits-src-main@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 E354B1AEE416; Tue, 17 May 2022 12:11:32 +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 4L2ZjJ3bStz3PWq; Tue, 17 May 2022 12:11:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652789492; 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=B+sxDBfKysqvquwzSK7uhbP63O/NmHSdGSiFQhu6LR8=; b=U8ETH3PwzUzI+TdQrRHHaFbgHlofj+FQIjyKPuH9CY9J4edhml+vVbXfMLYaIwCjv5DvyU uT0y1q9DBEd115sfWHQykAQayy+dh9Bdz0SrRyApWJQ7wd7jc29C7iuJBd/nPi/VAikRe3 0q/HbZS9fQ7chf1P8yA/M5Bo2ICejoQi/IoLIxtmYBNplat+DF4JbZQFTnFf6W9t05AQ5I XkNseTYG8fe6fgH2YzDAqVHk80bXJmr1SdbezjlAtrN24r9W72lUXQiVYpa3PeVpJJNGD6 KZVAcLRf0IlFJSyhFOIagMjVvIkP6W7GgGNunPPtAkQY054SFLnxBvKi9OUMFw== 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 3F131146A9; Tue, 17 May 2022 12:11:32 +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 24HCBWWK092903; Tue, 17 May 2022 12:11:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24HCBWxD092892; Tue, 17 May 2022 12:11:32 GMT (envelope-from git) Date: Tue, 17 May 2022 12:11:32 GMT Message-Id: <202205171211.24HCBWxD092892@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: 29d5f0c14805 - main - LinuxKPI: Convert lkpi-shrinker lock to sx. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 29d5f0c148059806d8f0d9e55acdd072994fa450 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652789492; 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=B+sxDBfKysqvquwzSK7uhbP63O/NmHSdGSiFQhu6LR8=; b=ww31GwW/9GcwzX9XPMfMtLFpJEeJjfxu8kwhQ6u08ePPiZznOFsEcfkzruB5s8NrX2S/HL 8g+SQ2zMiPpWRaIYds4Na+NYM5XbarirOaUMbzAEGtswtqw5WQZfUiX71FwK9VnAMA0mbe Q8XQntGCPpdN7yqTwdDsWnkftcMwBjh/ZUv1wK/OBGl9LeSLLtx7YrI0eXRSdS1s9v/Zpx rx2/ZiW0aOkp4nzjGfGcYJ0979AMZlSAtTxbwv9BxPdq0bcCl4LCJZZRnL5sYBiJ/Iz4eC BnJWlVKDA7qdwyUQaH1J9ZU0DYlOLBGRAt40v/Ds9Vx8O5K/4vwHs8WmeZOxDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652789492; a=rsa-sha256; cv=none; b=HOjraQEIYD8SXnWF6BzJkTyZJBkVmoEjNdGf2vHHhpKimfLPKltsU2XzStte5LCmT0OIKE q32m/q2W5PS75V6e9tT9nqMBOCXepwBiw51/j2Nxm8rStTt/wuxOXDZJnebxaU10TH+IUf ZNlJz2P0NnUWotebZAu6N1Y5yFlFaULkXQzX4KdvD2LGS0SBe6iJcReFTmMH5ufSxHdwsK NPP4WbVjiC3gb8Afo8BPXQU7QgwRfQylcrLtAr0oid9crByaeMZ3MV3E624BhHeesFhiCO 3IolB+zdvSdRMzVOW1EUoRKPM1xajVP1kgUwl0bgfiiUjH35HA4xUzR+oakFiw== 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=29d5f0c148059806d8f0d9e55acdd072994fa450 commit 29d5f0c148059806d8f0d9e55acdd072994fa450 Author: Vladimir Kondratyev AuthorDate: 2022-05-17 12:10:20 +0000 Commit: Vladimir Kondratyev CommitDate: 2022-05-17 12:10:20 +0000 LinuxKPI: Convert lkpi-shrinker lock to sx. This fixes "might_sleep() with the following non-sleepable locks held: exclusive sleep mutex lkpi-shrinker" warnings. MFC after: 1 week Reviewed by: hselasky, manu Differential Revision: https://reviews.freebsd.org/D35047 --- sys/compat/linuxkpi/common/src/linux_shrinker.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_shrinker.c b/sys/compat/linuxkpi/common/src/linux_shrinker.c index b66316c22013..b48e491a4e2f 100644 --- a/sys/compat/linuxkpi/common/src/linux_shrinker.c +++ b/sys/compat/linuxkpi/common/src/linux_shrinker.c @@ -34,13 +34,13 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include +#include #include #include TAILQ_HEAD(, shrinker) lkpi_shrinkers = TAILQ_HEAD_INITIALIZER(lkpi_shrinkers); -static struct mtx mtx_shrinker; +static struct sx sx_shrinker; int linuxkpi_register_shrinker(struct shrinker *s) @@ -49,9 +49,9 @@ linuxkpi_register_shrinker(struct shrinker *s) KASSERT(s != NULL, ("NULL shrinker")); KASSERT(s->count_objects != NULL, ("NULL shrinker")); KASSERT(s->scan_objects != NULL, ("NULL shrinker")); - mtx_lock(&mtx_shrinker); + sx_xlock(&sx_shrinker); TAILQ_INSERT_TAIL(&lkpi_shrinkers, s, next); - mtx_unlock(&mtx_shrinker); + sx_xunlock(&sx_shrinker); return (0); } @@ -59,9 +59,9 @@ void linuxkpi_unregister_shrinker(struct shrinker *s) { - mtx_lock(&mtx_shrinker); + sx_xlock(&sx_shrinker); TAILQ_REMOVE(&lkpi_shrinkers, s, next); - mtx_unlock(&mtx_shrinker); + sx_xunlock(&sx_shrinker); } #define SHRINKER_BATCH 512 @@ -94,12 +94,11 @@ linuxkpi_vm_lowmem(void *arg __unused) { struct shrinker *s; - linux_set_current(curthread); - mtx_lock(&mtx_shrinker); + sx_xlock(&sx_shrinker); TAILQ_FOREACH(s, &lkpi_shrinkers, next) { shrinker_shrink(s); } - mtx_unlock(&mtx_shrinker); + sx_xunlock(&sx_shrinker); } static eventhandler_tag lowmem_tag; @@ -108,7 +107,7 @@ static void linuxkpi_sysinit_shrinker(void *arg __unused) { - mtx_init(&mtx_shrinker, "lkpi-shrinker", NULL, MTX_DEF); + sx_init(&sx_shrinker, "lkpi-shrinker"); lowmem_tag = EVENTHANDLER_REGISTER(vm_lowmem, linuxkpi_vm_lowmem, NULL, EVENTHANDLER_PRI_FIRST); } @@ -117,7 +116,7 @@ static void linuxkpi_sysuninit_shrinker(void *arg __unused) { - mtx_destroy(&mtx_shrinker); + sx_destroy(&sx_shrinker); EVENTHANDLER_DEREGISTER(vm_lowmem, lowmem_tag); }