From nobody Tue Nov 29 10:39:07 2022 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 4NLzNC4xcnz4jSvw; Tue, 29 Nov 2022 10:39:07 +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 4NLzNC4LVnz3syQ; Tue, 29 Nov 2022 10:39:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669718347; 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=mTmh1V7NMQWoIVTkBzkU+HRpNzr1PCHdZRMvPVauuAA=; b=Gh/qNIwVIKO7BXiCH/RTDXtdNmjkEtU0Gp4VbAcpgngzBdFuBD9fi9H1KG/05FbkGMJXfa fq6ruHF6trJGUrr2s5QYWRvZYKYenSwOQ0RQtMZUTwAsxIs0RwtThN111omGx1N5BQyMj/ blhZqtF6iteL4cPuJO5gO8zRtrjL8u62u6Cr8CwOgEAhflyrXwCticGOe6TDt9sVrNOVeR TL84fM2gNTboYrkNoN5vQyB6ZcU1ngaXkxdcVFDlrzoFg12yzuB81RiIbDZq0bR1adO4JY guhmCWbO2goK8M/xMi2VZbZ5lfdaTKulaDBU/14l1czSOjXa/Ag90mdJkDy5wA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669718347; 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=mTmh1V7NMQWoIVTkBzkU+HRpNzr1PCHdZRMvPVauuAA=; b=ZjRJGQaaadxXUz1DhB1lQCHryLge5rlLh2Lv7xAS1tdzgFF77mnisJwqwdkZWH+n1Em9AS MO3L/QjIKzWxvFFkOO3gxMXuDNBAx1o2MqlQPMBmv/Wz9x2VGfam31PmR/EZXiHagIO6V2 q5xHGxp+cfkO4b4mPz468K78eYNPhhvdyBsdfVpmvq580uyg8e+vpOPDDqaVjMdqzbF9Wd h5Ng2mEXd1M29TSpT0ANhaB5A4/CMNmO/DWtR2q9u+UyVB+iGBDDf+HI4nDEnSV9F2FLj7 +htY1L9fy+S0xS4ZXCY9ux6P9GXHW3YsYw5Lx/ah4xKxEfu78P7b6ob07WmVdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669718347; a=rsa-sha256; cv=none; b=mtVWuMtVaw9JF0LJ3qq+4CB1IqlrL7nVilPUteHlap9L6yo1/J/SF5Un/VwzfUBvjPZFwC aE6TP2SRMM7+UwVP3YgxD6H7AfnQAY0fqKNV39D9Q+kF3SWaI90s3kxnX0pR4dcjGWKNuQ 4DAWnUdmf8qm5E7jrNiGB0tQZpkPbUDO+fy7BxKXXyxyj3U0GRTNTYR0ZSnUUgmuZPjq0Y 93Nq74lNpjM/1KMhqDUfUvntBd2eAiJac5oh6m+z5IvJC+hAlV5entKrbm76ToFEAG7fLb TOimrdLiftxAv2IhV6s/8XPNzDggcO5HYv+X5XpdAf1iTEEibxWhm5aSuoMHPA== 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 4NLzNC3HZCzFB8; Tue, 29 Nov 2022 10:39:07 +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 2ATAd7ei045067; Tue, 29 Nov 2022 10:39:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ATAd7dR045066; Tue, 29 Nov 2022 10:39:07 GMT (envelope-from git) Date: Tue, 29 Nov 2022 10:39:07 GMT Message-Id: <202211291039.2ATAd7dR045066@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: f16383d44d4e - stable/13 - linuxkpi: Add down_read_killable() 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/13 X-Git-Reftype: branch X-Git-Commit: f16383d44d4e3dc0c71d292279eadcaf6f312923 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=f16383d44d4e3dc0c71d292279eadcaf6f312923 commit f16383d44d4e3dc0c71d292279eadcaf6f312923 Author: Jake Freeland AuthorDate: 2022-09-20 17:35:19 +0000 Commit: Emmanuel Vadot CommitDate: 2022-11-29 10:09:31 +0000 linuxkpi: Add down_read_killable() Reviewed by: hselasky Differential Revision: https://reviews.freebsd.org/D36528 Sponsored by: Google, Inc. (GSoC 2022) (cherry picked from commit f0b0f28f35e79d8777f4ba89d5065d3665b43866) --- sys/compat/linuxkpi/common/include/linux/rwsem.h | 2 ++ sys/compat/linuxkpi/common/src/linux_lock.c | 13 +++++++++++++ 2 files changed, 15 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/rwsem.h b/sys/compat/linuxkpi/common/include/linux/rwsem.h index fc3580bc186e..a08668ed6e1e 100644 --- a/sys/compat/linuxkpi/common/include/linux/rwsem.h +++ b/sys/compat/linuxkpi/common/include/linux/rwsem.h @@ -46,6 +46,7 @@ struct rw_semaphore { #define down_read(_rw) sx_slock(&(_rw)->sx) #define up_read(_rw) sx_sunlock(&(_rw)->sx) #define down_read_trylock(_rw) !!sx_try_slock(&(_rw)->sx) +#define down_read_killable(_rw) linux_down_read_killable(_rw) #define down_write_trylock(_rw) !!sx_try_xlock(&(_rw)->sx) #define down_write_killable(_rw) linux_down_write_killable(_rw) #define downgrade_write(_rw) sx_downgrade(&(_rw)->sx) @@ -80,6 +81,7 @@ linux_init_rwsem(struct rw_semaphore *rw, const char *name) sx_init_flags(&rw->sx, name, SX_NOWITNESS); } +extern int linux_down_read_killable(struct rw_semaphore *); extern int linux_down_write_killable(struct rw_semaphore *); #endif /* _LINUXKPI_LINUX_RWSEM_H_ */ diff --git a/sys/compat/linuxkpi/common/src/linux_lock.c b/sys/compat/linuxkpi/common/src/linux_lock.c index b04a7738d036..0e9a2fecaf7d 100644 --- a/sys/compat/linuxkpi/common/src/linux_lock.c +++ b/sys/compat/linuxkpi/common/src/linux_lock.c @@ -159,6 +159,19 @@ linux_mutex_lock_interruptible(mutex_t *m) return (error); } +int +linux_down_read_killable(struct rw_semaphore *rw) +{ + int error; + + error = -sx_slock_sig(&rw->sx); + if (error != 0) { + linux_schedule_save_interrupt_value(current, error); + error = -EINTR; + } + return (error); +} + int linux_down_write_killable(struct rw_semaphore *rw) {