From nobody Mon Dec 1 21:30:06 2025 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 38B78337118 for ; Thu, 27 Nov 2025 15:54:37 +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=1764258879; cv=none; b=T5u1I3ms9nuusosJv+QF+ACDqfEfX3wgWHNai62JUvvzWDDfXU7jJoKoWBa98xKus3H0lo1ORm0FHRJQ7EsMMj49u0V7CJ4ddLgns9NijLZvOuCx57wxx6ty2DYFLDut+i3J5HwSyzf6MPR0jlSjEhbmsfDvuX7VKlBT+NWhQtk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764258879; c=relaxed/simple; bh=EyFIbKgcE2nNkpl/0llNSGiEXglIJGx3J0RgOMEIjfM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IJwiYq0zXYt+cr8eLvBotQuc4e8ZLWjh9A6E8w8wzkCuIyCUldD0r8zuhSjWYZwgVZ8Kg1a5HI1Uo62oRnuy9oWwkufA0Z6ga7JVShFegTXizmAFOctaM/xhT1efqzdr5bPnZa8d5h26XiOmlAOl2E0e0DYym6GDYCN9SgsnuSc= 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=QsjcsMX7; 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="QsjcsMX7" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1764258877; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9eGE6EKz24C+DQ/SaMTDwnGe0jrgOz1z3E9DUmUtjrk=; b=QsjcsMX7A6nfDSq8eK1xE4hnlWja0FPnqWLpUgwctzmGdnn6V/dFLK6zoYZg+bEh07z6pa AVxun7fpMPwGXIIVVppNlPK0ZHFsk6soCT/cgS4UCVXv6wEbOu3SrazAHJ9HqofhlSpvEE T197+qL+cM/HyxjPzmsbC9nEjpdCcXw= 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-203-8uz7N-XOMO2lb15TkskJNA-1; Thu, 27 Nov 2025 10:54:32 -0500 X-MC-Unique: 8uz7N-XOMO2lb15TkskJNA-1 X-Mimecast-MFC-AGG-ID: 8uz7N-XOMO2lb15TkskJNA_1764258870 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 87040180049F; Thu, 27 Nov 2025 15:54:30 +0000 (UTC) Received: from localhost (unknown [10.2.16.53]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8FAAB19560B0; Thu, 27 Nov 2025 15:54:29 +0000 (UTC) From: Stefan Hajnoczi To: linux-block@vger.kernel.org Cc: Keith Busch , "Martin K. Petersen" , linux-kernel@vger.kernel.org, "James E.J. Bottomley" , Christoph Hellwig , Mike Christie , linux-nvme@lists.infradead.org, Jens Axboe , linux-scsi@vger.kernel.org, Sagi Grimberg , Stefan Hajnoczi Subject: [PATCH v2 1/4] scsi: sd: reject invalid pr_read_keys() num_keys values Date: Thu, 27 Nov 2025 10:54:21 -0500 Message-ID: <20251127155424.617569-2-stefanha@redhat.com> In-Reply-To: <20251127155424.617569-1-stefanha@redhat.com> References: <20251127155424.617569-1-stefanha@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Content-Type: text/plain; charset="utf-8" The pr_read_keys() interface has a u32 num_keys parameter. The SCSI PERSISTENT RESERVE IN command has a maximum READ KEYS service action size of 65536 bytes. Reject num_keys values that are too large to fit into the SCSI command. This will become important when pr_read_keys() is exposed to untrusted userspace via an ioctl. Signed-off-by: Stefan Hajnoczi Reviewed-by: Hannes Reinecke Reviewed-by: Martin K. Petersen --- drivers/scsi/sd.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 0252d3f6bed17..e436ed977cdb4 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -1974,9 +1974,18 @@ static int sd_pr_read_keys(struct block_device *bdev= , struct pr_keys *keys_info) { int result, i, data_offset, num_copy_keys; u32 num_keys =3D keys_info->num_keys; - int data_len =3D num_keys * 8 + 8; + int data_len; u8 *data; =20 + /* + * Each reservation key takes 8 bytes and there is an 8-byte header + * before the reservation key list. The total size must fit into the + * 16-bit ALLOCATION LENGTH field. + */ + if (num_keys > (USHRT_MAX / 8) - 1) + return -EINVAL; + + data_len =3D num_keys * 8 + 8; data =3D kzalloc(data_len, GFP_KERNEL); if (!data) return -ENOMEM; --=20 2.52.0 From nobody Mon Dec 1 21:30:06 2025 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 0F21533769C for ; Thu, 27 Nov 2025 15:54:39 +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=1764258881; cv=none; b=f4LhzHbY9IDp/32VpxrnFbp6VV9gb+5DRVkF3yFVbiF5XR0JlxXmWjm/M2pNRRQgUeXk9unIEXu3iTGdyEYAZR590HYJeBLSOnt8Yn1cD7Qyjvj/C5IFWZwLfu2gb6/XFdYfEZRZ0uvLwFmnLvVJ/I5NaFsBj5BIJKLh/d4H8ag= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764258881; c=relaxed/simple; bh=CG0WCXs5GtINbmf9Z6msAYJS70/y7x1p3+LE85tX23I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=deGIlTcS/0jHs+tsqJI+yxp3nA4L+8SVOzrDz83VSxNWLR0FHYPTBVMU/EuxCOCK9ZvsonBc7ser6+nkeNd9txGB/cIq1ECjvApriQ8i9YXrbc9ZkAHE18490vwAvRUJAHFGBBvZhE2aeAJyL1SWR9HH6y/z5GoR9ma7b9j12is= 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=hTL0zVHK; 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="hTL0zVHK" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1764258878; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4yiEqdjZP2pjR5NE43rCMghlmUF6oy2t/sXcmabl5AU=; b=hTL0zVHKDS9Q9IKWaciQ2Mh9UwWh2iVRE2gSkQFARClmH1bRapvR2NuAtz7K+HYdBRBnbk nug9iZ1L/2z5v4MMbkHJD5yrpLRY/tavkRX4qz8vozDK0RPWgSilPWO5uCGkBIK0G+z/sa c6W7GAJWU+3TBjZDvyXtVrj30+jgICQ= Received: from mx-prod-mc-08.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-73-TZXPpSsGNVuPgZswTFV2mw-1; Thu, 27 Nov 2025 10:54:35 -0500 X-MC-Unique: TZXPpSsGNVuPgZswTFV2mw-1 X-Mimecast-MFC-AGG-ID: TZXPpSsGNVuPgZswTFV2mw_1764258873 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2D98D180034D; Thu, 27 Nov 2025 15:54:33 +0000 (UTC) Received: from localhost (unknown [10.2.16.53]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1D126180047F; Thu, 27 Nov 2025 15:54:31 +0000 (UTC) From: Stefan Hajnoczi To: linux-block@vger.kernel.org Cc: Keith Busch , "Martin K. Petersen" , linux-kernel@vger.kernel.org, "James E.J. Bottomley" , Christoph Hellwig , Mike Christie , linux-nvme@lists.infradead.org, Jens Axboe , linux-scsi@vger.kernel.org, Sagi Grimberg , Stefan Hajnoczi Subject: [PATCH v2 2/4] nvme: reject invalid pr_read_keys() num_keys values Date: Thu, 27 Nov 2025 10:54:22 -0500 Message-ID: <20251127155424.617569-3-stefanha@redhat.com> In-Reply-To: <20251127155424.617569-1-stefanha@redhat.com> References: <20251127155424.617569-1-stefanha@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 Content-Type: text/plain; charset="utf-8" The pr_read_keys() interface has a u32 num_keys parameter. The NVMe Reservation Report command has a u32 maximum length. Reject num_keys values that are too large to fit. This will become important when pr_read_keys() is exposed to untrusted userspace via an ioctl. Signed-off-by: Stefan Hajnoczi Reviewed-by: Hannes Reinecke Reviewed-by: Martin K. Petersen --- drivers/nvme/host/pr.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/nvme/host/pr.c b/drivers/nvme/host/pr.c index ca6a74607b139..156a2ae1fac2e 100644 --- a/drivers/nvme/host/pr.c +++ b/drivers/nvme/host/pr.c @@ -233,6 +233,10 @@ static int nvme_pr_read_keys(struct block_device *bdev, int ret, i; bool eds; =20 + /* Check that keys fit into u32 rse_len */ + if (num_keys > (U32_MAX - sizeof(*rse)) / sizeof(rse->regctl_eds[0])) + return -EINVAL; + /* * Assume we are using 128-bit host IDs and allocate a buffer large * enough to get enough keys to fill the return keys buffer. --=20 2.52.0 From nobody Mon Dec 1 21:30:06 2025 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 B1F603385A0 for ; Thu, 27 Nov 2025 15:54:44 +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=1764258886; cv=none; b=ji5NyYg0w7p94zIzjcMxSJvHwoNGD2CFRRn9KKGfqLN8eNTNlW/20mg8cg4XQyMYJet7K99AO4f1fhDxJiXna8yoEPtL7CZiG0rqVm2qRDYXJbpZsrfkFTYbbCVw7qUlsCwqm/taTfU/Q0y+ldSQIR7K5ppX6O7coQG6DQiPtm4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764258886; c=relaxed/simple; bh=egCb4rKT0BX/LR4YMOIGxOs2/u5oGoqgTPsZiXW4/1M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kJL6r4fnPEQ9tqOW/JtJCR6CKZVSvhXIkxdv2aboD5IYS1fUGkhmnm/wVppabd19nJ+bG2Gd7ZLk+e+C9SgwnHv46N9z5f8X1Q2skcKvwGd+BHYBd1VyQ8zc+u2pkXv+4pa4kM9euB2fdcXSd3rt1X4zxCVlAlccp/a13Rz34m8= 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=Xe/aq+Vh; 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="Xe/aq+Vh" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1764258883; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Or+hOooxS4SFn2ETCxdT77BmFRIW+dZi7o2KBfzpbfo=; b=Xe/aq+VhiNa4gPaeN6C7pA3a0S9wRaRTN1t2MBI53ryW119dYdVOhV+L0hAhvqjyKAe0IP SuYVDplQKoX3rPySS3Xz3oYmLIbRNg2TD6IvZ97UFt/ZNnRPb5ffSkFxHP2KhjUwS5NZMp DG7//Yl7426liLCjctBLCJ4YNRM/iKQ= Received: from mx-prod-mc-08.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-59-jbZUp9cMNLmpgzKEOzE8Kw-1; Thu, 27 Nov 2025 10:54:38 -0500 X-MC-Unique: jbZUp9cMNLmpgzKEOzE8Kw-1 X-Mimecast-MFC-AGG-ID: jbZUp9cMNLmpgzKEOzE8Kw_1764258875 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1A7E61800342; Thu, 27 Nov 2025 15:54:35 +0000 (UTC) Received: from localhost (unknown [10.2.16.53]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 737531800451; Thu, 27 Nov 2025 15:54:34 +0000 (UTC) From: Stefan Hajnoczi To: linux-block@vger.kernel.org Cc: Keith Busch , "Martin K. Petersen" , linux-kernel@vger.kernel.org, "James E.J. Bottomley" , Christoph Hellwig , Mike Christie , linux-nvme@lists.infradead.org, Jens Axboe , linux-scsi@vger.kernel.org, Sagi Grimberg , Stefan Hajnoczi Subject: [PATCH v2 3/4] block: add IOC_PR_READ_KEYS ioctl Date: Thu, 27 Nov 2025 10:54:23 -0500 Message-ID: <20251127155424.617569-4-stefanha@redhat.com> In-Reply-To: <20251127155424.617569-1-stefanha@redhat.com> References: <20251127155424.617569-1-stefanha@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Content-Type: text/plain; charset="utf-8" Add a Persistent Reservations ioctl to read the list of currently registered reservation keys. This calls the pr_ops->read_keys() function that was previously added in commit c787f1baa503 ("block: Add PR callouts for read keys and reservation") but was only used by the in-kernel SCSI target so far. The IOC_PR_READ_KEYS ioctl is necessary so that userspace applications that rely on Persistent Reservations ioctls have a way of inspecting the current state. Cluster managers and validation tests need this functionality. Signed-off-by: Stefan Hajnoczi Reviewed-by: Hannes Reinecke Reviewed-by: Martin K. Petersen --- include/uapi/linux/pr.h | 7 +++++ block/ioctl.c | 59 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) diff --git a/include/uapi/linux/pr.h b/include/uapi/linux/pr.h index d8126415966f3..fcb74eab92c80 100644 --- a/include/uapi/linux/pr.h +++ b/include/uapi/linux/pr.h @@ -56,6 +56,12 @@ struct pr_clear { __u32 __pad; }; =20 +struct pr_read_keys { + __u32 generation; + __u32 num_keys; + __u64 keys_ptr; +}; + #define PR_FL_IGNORE_KEY (1 << 0) /* ignore existing key */ =20 #define IOC_PR_REGISTER _IOW('p', 200, struct pr_registration) @@ -64,5 +70,6 @@ struct pr_clear { #define IOC_PR_PREEMPT _IOW('p', 203, struct pr_preempt) #define IOC_PR_PREEMPT_ABORT _IOW('p', 204, struct pr_preempt) #define IOC_PR_CLEAR _IOW('p', 205, struct pr_clear) +#define IOC_PR_READ_KEYS _IOWR('p', 206, struct pr_read_keys) =20 #endif /* _UAPI_PR_H */ diff --git a/block/ioctl.c b/block/ioctl.c index d7489a56b33c3..63b942392b234 100644 --- a/block/ioctl.c +++ b/block/ioctl.c @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include +#include #include #include #include @@ -423,6 +424,62 @@ static int blkdev_pr_clear(struct block_device *bdev, = blk_mode_t mode, return ops->pr_clear(bdev, c.key); } =20 +static int blkdev_pr_read_keys(struct block_device *bdev, blk_mode_t mode, + struct pr_read_keys __user *arg) +{ + const struct pr_ops *ops =3D bdev->bd_disk->fops->pr_ops; + struct pr_keys *keys_info __free(kfree) =3D NULL; + struct pr_read_keys inout; + u64 __user *keys_ptr; + size_t keys_info_len; + size_t keys_copy_len; + u32 num_copy_keys; + int ret; + + if (!blkdev_pr_allowed(bdev, mode)) + return -EPERM; + if (!ops || !ops->pr_read_keys) + return -EOPNOTSUPP; + + if (copy_from_user(&inout, arg, sizeof(inout))) + return -EFAULT; + + /* + * 64-bit hosts could handle more keys than 32-bit hosts, but this + * limit is more than enough in practice. + */ + if (inout.num_keys > (U32_MAX - sizeof(*keys_info)) / + sizeof(keys_info->keys[0])) + return -EINVAL; + + keys_info_len =3D struct_size(keys_info, keys, inout.num_keys); + keys_info =3D kzalloc(keys_info_len, GFP_KERNEL); + if (!keys_info) + return -ENOMEM; + + keys_info->num_keys =3D inout.num_keys; + + ret =3D ops->pr_read_keys(bdev, keys_info); + if (ret) + return ret; + + /* Copy out individual keys */ + keys_ptr =3D u64_to_user_ptr(inout.keys_ptr); + num_copy_keys =3D min(inout.num_keys, keys_info->num_keys); + keys_copy_len =3D num_copy_keys * sizeof(keys_info->keys[0]); + + if (copy_to_user(keys_ptr, keys_info->keys, keys_copy_len)) + return -EFAULT; + + /* Copy out the arg struct */ + inout.generation =3D keys_info->generation; + inout.num_keys =3D keys_info->num_keys; + + if (copy_to_user(arg, &inout, sizeof(inout))) + return -EFAULT; + return ret; +} + static int blkdev_flushbuf(struct block_device *bdev, unsigned cmd, unsigned long arg) { @@ -644,6 +701,8 @@ static int blkdev_common_ioctl(struct block_device *bde= v, blk_mode_t mode, return blkdev_pr_preempt(bdev, mode, argp, true); case IOC_PR_CLEAR: return blkdev_pr_clear(bdev, mode, argp); + case IOC_PR_READ_KEYS: + return blkdev_pr_read_keys(bdev, mode, argp); default: return blk_get_meta_cap(bdev, cmd, argp); } --=20 2.52.0 From nobody Mon Dec 1 21:30:06 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.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 B753B337106 for ; Thu, 27 Nov 2025 15:54:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764258888; cv=none; b=k/1KYYyiIFn2z3Eb9jb/FD/5IeAiMDXzizVp+u05j1lCAWUisk1A2UHXDXaCt6pG5DNIl5h2FuxvTZGcOeij8r71b/I2FQ1ujBRHkHRAfQsh9Uch7qSJFqL69h9imK2RzjT16GRnsTbDMaNhxMuhj5ojf4oHtP6shPsSwCqv8tk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764258888; c=relaxed/simple; bh=UnK2ntYweN/+uoHx/cZ35NmP35Rk3AuyNeP3XG/hKoM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dRIpfEdPOiE5wmTtDaMUEwyRDMyucAi2FBt+V/4bNlAT/fij7+f3EwrYKa6Qqmrwf8JdwAzRy4YwVAisk3HuIlOX3KdxSbYsJIHhqHUIqj6h6Y7r7BzqaQ02qnHCMgbWX+3tzMHEtVs/O+qQuMPgQiCe3kCzt9iQSlAbqlp0TOw= 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=IgE4RC3q; arc=none smtp.client-ip=170.10.133.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="IgE4RC3q" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1764258884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DJlFUMlUmKnKN3LsYjfFmXO2vVL0XSZBtqZZGvyT5E0=; b=IgE4RC3qN3koPWTRJr8PeRyqZ0lrVUd1dAIlEWpdAmk9iKT6FYcwg5RSlo5RUFCzdKXKMl 7b0hkmvO0Z8cXpYlUKrTCRux3lEMzUBVHlt8nUmCRNUK1bNKExpwAUEhDsSkE8UQH0Fe2v dsmRcMw+y1ztdqfGWki7xNZK9X2kzKg= 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-444-moWsFbkRM5u0v3XJFm7rjA-1; Thu, 27 Nov 2025 10:54:39 -0500 X-MC-Unique: moWsFbkRM5u0v3XJFm7rjA-1 X-Mimecast-MFC-AGG-ID: moWsFbkRM5u0v3XJFm7rjA_1764258877 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 591101800358; Thu, 27 Nov 2025 15:54:37 +0000 (UTC) Received: from localhost (unknown [10.2.16.53]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 65D4B195608E; Thu, 27 Nov 2025 15:54:36 +0000 (UTC) From: Stefan Hajnoczi To: linux-block@vger.kernel.org Cc: Keith Busch , "Martin K. Petersen" , linux-kernel@vger.kernel.org, "James E.J. Bottomley" , Christoph Hellwig , Mike Christie , linux-nvme@lists.infradead.org, Jens Axboe , linux-scsi@vger.kernel.org, Sagi Grimberg , Stefan Hajnoczi , Hannes Reinecke Subject: [PATCH v2 4/4] block: add IOC_PR_READ_RESERVATION ioctl Date: Thu, 27 Nov 2025 10:54:24 -0500 Message-ID: <20251127155424.617569-5-stefanha@redhat.com> In-Reply-To: <20251127155424.617569-1-stefanha@redhat.com> References: <20251127155424.617569-1-stefanha@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Content-Type: text/plain; charset="utf-8" Add a Persistent Reservations ioctl to read the current reservation. This calls the pr_ops->read_reservation() function that was previously added in commit c787f1baa503 ("block: Add PR callouts for read keys and reservation") but was only used by the in-kernel SCSI target so far. The IOC_PR_READ_RESERVATION ioctl is necessary so that userspace applications that rely on Persistent Reservations ioctls have a way of inspecting the current state. Cluster managers and validation tests need this functionality. Signed-off-by: Stefan Hajnoczi Reviewed-by: Hannes Reinecke Reviewed-by: Christoph Hellwig Reviewed-by: Martin K. Petersen --- include/uapi/linux/pr.h | 7 +++++++ block/ioctl.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/include/uapi/linux/pr.h b/include/uapi/linux/pr.h index fcb74eab92c80..847f3051057af 100644 --- a/include/uapi/linux/pr.h +++ b/include/uapi/linux/pr.h @@ -62,6 +62,12 @@ struct pr_read_keys { __u64 keys_ptr; }; =20 +struct pr_read_reservation { + __u64 key; + __u32 generation; + __u32 type; +}; + #define PR_FL_IGNORE_KEY (1 << 0) /* ignore existing key */ =20 #define IOC_PR_REGISTER _IOW('p', 200, struct pr_registration) @@ -71,5 +77,6 @@ struct pr_read_keys { #define IOC_PR_PREEMPT_ABORT _IOW('p', 204, struct pr_preempt) #define IOC_PR_CLEAR _IOW('p', 205, struct pr_clear) #define IOC_PR_READ_KEYS _IOWR('p', 206, struct pr_read_keys) +#define IOC_PR_READ_RESERVATION _IOR('p', 207, struct pr_read_reservation) =20 #endif /* _UAPI_PR_H */ diff --git a/block/ioctl.c b/block/ioctl.c index 63b942392b234..a51628236fc7f 100644 --- a/block/ioctl.c +++ b/block/ioctl.c @@ -480,6 +480,32 @@ static int blkdev_pr_read_keys(struct block_device *bd= ev, blk_mode_t mode, return ret; } =20 +static int blkdev_pr_read_reservation(struct block_device *bdev, + blk_mode_t mode, struct pr_read_reservation __user *arg) +{ + const struct pr_ops *ops =3D bdev->bd_disk->fops->pr_ops; + struct pr_held_reservation rsv =3D {}; + struct pr_read_reservation out =3D {}; + int ret; + + if (!blkdev_pr_allowed(bdev, mode)) + return -EPERM; + if (!ops || !ops->pr_read_reservation) + return -EOPNOTSUPP; + + ret =3D ops->pr_read_reservation(bdev, &rsv); + if (ret) + return ret; + + out.key =3D rsv.key; + out.generation =3D rsv.generation; + out.type =3D rsv.type; + + if (copy_to_user(arg, &out, sizeof(out))) + return -EFAULT; + return 0; +} + static int blkdev_flushbuf(struct block_device *bdev, unsigned cmd, unsigned long arg) { @@ -703,6 +729,8 @@ static int blkdev_common_ioctl(struct block_device *bde= v, blk_mode_t mode, return blkdev_pr_clear(bdev, mode, argp); case IOC_PR_READ_KEYS: return blkdev_pr_read_keys(bdev, mode, argp); + case IOC_PR_READ_RESERVATION: + return blkdev_pr_read_reservation(bdev, mode, argp); default: return blk_get_meta_cap(bdev, cmd, argp); } --=20 2.52.0