From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 890EC3624A6 for ; Fri, 29 May 2026 14:17:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780064227; cv=none; b=ZTMjdQy4vtuJOztMCZLG3AqOCVvyecsTVuB5LjIOeWHQPq/Sa/fKH0P4W5ntegFSnjex/sgozO0mdo7RWTkLZSexp7uoRrr4/IdRI/+yyHpH39z5WlkNnCcQoWPSExFLe7hHdNYLZTLp6L+j49pHewe4aPNxNL+3bq5ZOI2fgW0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780064227; c=relaxed/simple; bh=uj5FHyg1dp1m3zwzPOeTUvK5BvwIJX6/Vul9Q5KMs1U=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=Maj5uBP9j1Rvsh+dfqcI7e0+akgELo5FU7TJOvshE5+1Uivw6+WxFrd3+Fr73WDzWQ98gvBihJRd6Oks27WOTfSc57VmnVQBKBDdCHzqWUc135rGnux8FFSFNG9+7G8ptadcFntVM0N2JwI2ImS+juwig+rl5PmmOuAp+0IDs/Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=FV5cBlSY; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="FV5cBlSY" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1780064225; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type; bh=x0q+lJMH/2FKF1sujszc/SwvLDlRGdWCbKZaLs/VR0c=; b=FV5cBlSYSXNzlqwFlj7/EP7vS5GAr8WxQHjcJq05BklNZ5ainB0E+iP7jpafpq1Bj7xpcm 8A1lfaqgeEddEnxBZflJUlA1YUERq0Fdqo28RZ4rmzKnTbEMhfEKICJ8rUoGa2Hzb1XwB8 Ow0HOIOTTnUKkd1RwlcpCrIamNK9OOA= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-459-pWCEfxGWMT2PXT-uufPwzQ-1; Fri, 29 May 2026 10:16:59 -0400 X-MC-Unique: pWCEfxGWMT2PXT-uufPwzQ-1 X-Mimecast-MFC-AGG-ID: pWCEfxGWMT2PXT-uufPwzQ_1780064218 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E334918005B2; Fri, 29 May 2026 14:16:57 +0000 (UTC) Received: from fedora (unknown [10.44.33.166]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with SMTP id AFDD73002D2D; Fri, 29 May 2026 14:16:54 +0000 (UTC) Received: by fedora (nbSMTP-1.00) for uid 1000 oleg@redhat.com; Fri, 29 May 2026 16:16:57 +0200 (CEST) Date: Fri, 29 May 2026 16:16:52 +0200 From: Oleg Nesterov To: Peter Zijlstra , Ingo Molnar , Will Deacon , Boqun Feng , Waiman Long Cc: Marco Elver , Christian Brauner , linux-kernel@vger.kernel.org Subject: [PATCH] locking/rwsem: add scoped guard for down_read_killable() Message-ID: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 We have lock guards for down_read_trylock/interruptible() but down_read_killable() is missing. At least scoped_cond_guard(rwsem_read_kill, signal->exec_update_lock) can have a lot of users: __pidfd_fget(), mm_access(), find_mm_struct(), kernel_migrate_pages(), and probably more. Signed-off-by: Oleg Nesterov --- include/linux/rwsem.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/linux/rwsem.h b/include/linux/rwsem.h index 6a1a7bae5f81..f0cc72d8f0f2 100644 --- a/include/linux/rwsem.h +++ b/include/linux/rwsem.h @@ -259,6 +259,7 @@ extern void up_write(struct rw_semaphore *sem) __releases(sem); DEFINE_LOCK_GUARD_1(rwsem_read, struct rw_semaphore, down_read(_T->lock), up_read(_T->lock)) DEFINE_LOCK_GUARD_1_COND(rwsem_read, _try, down_read_trylock(_T->lock)) DEFINE_LOCK_GUARD_1_COND(rwsem_read, _intr, down_read_interruptible(_T->lock), _RET == 0) +DEFINE_LOCK_GUARD_1_COND(rwsem_read, _kill, down_read_killable(_T->lock), _RET == 0) DECLARE_LOCK_GUARD_1_ATTRS(rwsem_read, __acquires_shared(_T), __releases_shared(*(struct rw_semaphore **)_T)) #define class_rwsem_read_constructor(_T) WITH_LOCK_GUARD_1_ATTRS(rwsem_read, _T) @@ -266,6 +267,8 @@ DECLARE_LOCK_GUARD_1_ATTRS(rwsem_read_try, __acquires_shared(_T), __releases_sha #define class_rwsem_read_try_constructor(_T) WITH_LOCK_GUARD_1_ATTRS(rwsem_read_try, _T) DECLARE_LOCK_GUARD_1_ATTRS(rwsem_read_intr, __acquires_shared(_T), __releases_shared(*(struct rw_semaphore **)_T)) #define class_rwsem_read_intr_constructor(_T) WITH_LOCK_GUARD_1_ATTRS(rwsem_read_intr, _T) +DECLARE_LOCK_GUARD_1_ATTRS(rwsem_read_kill, __acquires_shared(_T), __releases_shared(*(struct rw_semaphore **)_T)) +#define class_rwsem_read_kill_constructor(_T) WITH_LOCK_GUARD_1_ATTRS(rwsem_read_kill, _T) DEFINE_LOCK_GUARD_1(rwsem_write, struct rw_semaphore, down_write(_T->lock), up_write(_T->lock)) DEFINE_LOCK_GUARD_1_COND(rwsem_write, _try, down_write_trylock(_T->lock)) -- 2.52.0