From nobody Tue Jun 04 11:35:31 2024 X-Original-To: dev-commits-src-branches@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 4VtpS33SmYz5NHXc; Tue, 04 Jun 2024 11:35:31 +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 4VtpS32K5vz4NZ7; Tue, 4 Jun 2024 11:35:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717500931; 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=parmFWHVflMCx27eSlNX+5O9UIs0e4yNjvv2rpg5HV0=; b=bRaJZAanKZBYx9q65oWablzAs0lrbkp1eO7ang8K9rFNalSL+SSyuYkpCjKG9hf5cEc0fV 7thSsems/4I3myiflt4VjH66w/cNRRx+p6nmqFKLPs/dQ4eixtb6+PbSJi7LVEZB3jLRxm hEMlnZvWGS+itaztu5642YMc9GSqhZhEA+sp//vez9u9rb2hIBvyC0zs5s6APyPO70YNPY zqL0dB8jh7OHgnjAYzA1SBZY8ql5zCfSxrOwcygJFHtCGLfFxS5weJ2Ijxx1OVjW/axl+Z Db7Neq87srrkfYk3fI0QdHWXeVyP9e45MLI4s34Coge2kyxwIuAxgQlB8JNXAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717500931; a=rsa-sha256; cv=none; b=SSIig1qNZ7gig5/S9Jmj+SIQBQLACXlfjaMhSXLnHPFuuC80vdrg1PExFiC3eyf2gE/hdp OZbWxijVKtMybSFqG4SABM4k++ee5gqhIiJZaiKtnToXjXmyLBUMAcCZZJa/DxKqkPVWr1 EgmQ6NNpAgadZgGKsdTC+hFMjkrYgosSVdl06yVzMnvoErHNtiUPoZH97N2EOQ/9J/9AsM KscsyUTZTKu14iwUC0hnEy/CXykDtQJkHUXZZqMG+VmxUyVvwYbKtndt9Isn2EEgWK5dUB Gb7Ywf5aoR+pCrAK6cELrNii2sqODHauNN3vuXH3aMTjxDhEeGD85WTtyhz+uw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717500931; 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=parmFWHVflMCx27eSlNX+5O9UIs0e4yNjvv2rpg5HV0=; b=TdPFlOaaBoLLWHs0osds5CQ2L/TMLnmpDRysQcrmVtcPmNI20jC91TMW++hhdHyBAreo01 C3gRDAqEXjdU5ETPuHleCHfs6w0fOFZR3DSSiVvZVuUG89LfPdt+cG3JBOlrXsnIu/1w2Y KQv1cdRlxh3GVNm/9t97C6ZUAWvb8pqFC5yIpAZOfoH9N4Ttn4k+IGYZwJY1SZlUkttyPm 4m5cqZDXOFibLJQHLpjXI4Wkw8FcG+enBY0dig9R1OESMJRypc6bHgDiCyHs8TZADZPPNw D4hcCYYrozpyd/tPnAVxzWQQQyXgNemH6sr8Dx3xwcNIS9G0WVcgozkYDpxWiA== 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 4VtpS31VqVzGwb; Tue, 4 Jun 2024 11:35:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 454BZVDs011565; Tue, 4 Jun 2024 11:35:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 454BZVog011562; Tue, 4 Jun 2024 11:35:31 GMT (envelope-from git) Date: Tue, 4 Jun 2024 11:35:31 GMT Message-Id: <202406041135.454BZVog011562@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: f4f09d270c1d - stable/14 - linuxkpi: rwlock: Simplify code List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f4f09d270c1df58334accb94aadb89fb0f4b9f09 Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=f4f09d270c1df58334accb94aadb89fb0f4b9f09 commit f4f09d270c1df58334accb94aadb89fb0f4b9f09 Author: Emmanuel Vadot AuthorDate: 2024-05-15 09:05:29 +0000 Commit: Emmanuel Vadot CommitDate: 2024-06-04 11:23:11 +0000 linuxkpi: rwlock: Simplify code Just use a typedef for rwlock_t, no need to create a useless structure. Reviewed by: bz Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D45206 (cherry picked from commit 5c0a1923486e65cd47398e52c03cb289d6120a78) linuxkpi: rwlock: Fix rwlock_init Some linux code re-init some spinlock so add MTX_NEW to mtx_init. Reported by: rlibby Fixes: 5c0a1923486e ("linuxkpi: rwlock: Simplify code") (cherry picked from commit a7b222db122e99f587d87eeec303c8abc9aea04e) --- sys/compat/linuxkpi/common/include/linux/rwlock.h | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/rwlock.h b/sys/compat/linuxkpi/common/include/linux/rwlock.h index 8c1ee36ac4de..3030ec89ff1e 100644 --- a/sys/compat/linuxkpi/common/include/linux/rwlock.h +++ b/sys/compat/linuxkpi/common/include/linux/rwlock.h @@ -34,14 +34,12 @@ #include #include -typedef struct { - struct rwlock rw; -} rwlock_t; +typedef struct rwlock rwlock_t; -#define read_lock(_l) rw_rlock(&(_l)->rw) -#define write_lock(_l) rw_wlock(&(_l)->rw) -#define read_unlock(_l) rw_runlock(&(_l)->rw) -#define write_unlock(_l) rw_wunlock(&(_l)->rw) +#define read_lock(_l) rw_rlock(_l) +#define write_lock(_l) rw_wlock(_l) +#define read_unlock(_l) rw_runlock(_l) +#define write_unlock(_l) rw_wunlock(_l) #define read_lock_irq(lock) read_lock((lock)) #define read_unlock_irq(lock) read_unlock((lock)) #define write_lock_irq(lock) write_lock((lock)) @@ -54,13 +52,6 @@ typedef struct { do { read_unlock(lock); } while (0) #define write_unlock_irqrestore(lock, flags) \ do { write_unlock(lock); } while (0) - -static inline void -rwlock_init(rwlock_t *lock) -{ - - memset(&lock->rw, 0, sizeof(lock->rw)); - rw_init_flags(&lock->rw, "lnxrw", RW_NOWITNESS); -} +#define rwlock_init(_l) rw_init_flags(_l, "lnxrw", RW_NOWITNESS | RW_NEW) #endif /* _LINUXKPI_LINUX_RWLOCK_H_ */