From: Mike Christie <michael.christie@oracle.com> To: bvanassche@acm.org, hch@lst.de, martin.petersen@oracle.com, linux-scsi@vger.kernel.org, james.bottomley@hansenpartnership.com, linux-block@vger.kernel.org, dm-devel@redhat.com, snitzer@kernel.org, axboe@kernel.dk, linux-nvme@lists.infradead.org, chaitanyak@nvidia.com, kbusch@kernel.org, target-devel@vger.kernel.org Cc: Mike Christie <michael.christie@oracle.com> Subject: [PATCH v5 06/18] dm: Add support for block PR read keys/reservation Date: Fri, 24 Mar 2023 13:17:29 -0500 [thread overview] Message-ID: <20230324181741.13908-7-michael.christie@oracle.com> (raw) In-Reply-To: <20230324181741.13908-1-michael.christie@oracle.com> This adds support in dm for the block PR read keys and read reservation callouts. Signed-off-by: Mike Christie <michael.christie@oracle.com> --- drivers/md/dm.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/drivers/md/dm.c b/drivers/md/dm.c index f5cc330bb549..51e34e1a16bb 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -3114,6 +3114,8 @@ struct dm_pr { bool fail_early; int ret; enum pr_type type; + struct pr_keys *read_keys; + struct pr_held_reservation *rsv; }; static int dm_call_pr(struct block_device *bdev, iterate_devices_callout_fn fn, @@ -3346,12 +3348,79 @@ static int dm_pr_clear(struct block_device *bdev, u64 key) return r; } +static int __dm_pr_read_keys(struct dm_target *ti, struct dm_dev *dev, + sector_t start, sector_t len, void *data) +{ + struct dm_pr *pr = data; + const struct pr_ops *ops = dev->bdev->bd_disk->fops->pr_ops; + + if (!ops || !ops->pr_read_keys) { + pr->ret = -EOPNOTSUPP; + return -1; + } + + pr->ret = ops->pr_read_keys(dev->bdev, pr->read_keys); + if (!pr->ret) + return -1; + + return 0; +} + +static int dm_pr_read_keys(struct block_device *bdev, struct pr_keys *keys) +{ + struct dm_pr pr = { + .read_keys = keys, + }; + int ret; + + ret = dm_call_pr(bdev, __dm_pr_read_keys, &pr); + if (ret) + return ret; + + return pr.ret; +} + +static int __dm_pr_read_reservation(struct dm_target *ti, struct dm_dev *dev, + sector_t start, sector_t len, void *data) +{ + struct dm_pr *pr = data; + const struct pr_ops *ops = dev->bdev->bd_disk->fops->pr_ops; + + if (!ops || !ops->pr_read_reservation) { + pr->ret = -EOPNOTSUPP; + return -1; + } + + pr->ret = ops->pr_read_reservation(dev->bdev, pr->rsv); + if (!pr->ret) + return -1; + + return 0; +} + +static int dm_pr_read_reservation(struct block_device *bdev, + struct pr_held_reservation *rsv) +{ + struct dm_pr pr = { + .rsv = rsv, + }; + int ret; + + ret = dm_call_pr(bdev, __dm_pr_read_reservation, &pr); + if (ret) + return ret; + + return pr.ret; +} + static const struct pr_ops dm_pr_ops = { .pr_register = dm_pr_register, .pr_reserve = dm_pr_reserve, .pr_release = dm_pr_release, .pr_preempt = dm_pr_preempt, .pr_clear = dm_pr_clear, + .pr_read_keys = dm_pr_read_keys, + .pr_read_reservation = dm_pr_read_reservation, }; static const struct block_device_operations dm_blk_dops = { -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Mike Christie <michael.christie@oracle.com> To: bvanassche@acm.org, hch@lst.de, martin.petersen@oracle.com, linux-scsi@vger.kernel.org, james.bottomley@hansenpartnership.com, linux-block@vger.kernel.org, dm-devel@redhat.com, snitzer@kernel.org, axboe@kernel.dk, linux-nvme@lists.infradead.org, chaitanyak@nvidia.com, kbusch@kernel.org, target-devel@vger.kernel.org Cc: Mike Christie <michael.christie@oracle.com> Subject: [dm-devel] [PATCH v5 06/18] dm: Add support for block PR read keys/reservation Date: Fri, 24 Mar 2023 13:17:29 -0500 [thread overview] Message-ID: <20230324181741.13908-7-michael.christie@oracle.com> (raw) In-Reply-To: <20230324181741.13908-1-michael.christie@oracle.com> This adds support in dm for the block PR read keys and read reservation callouts. Signed-off-by: Mike Christie <michael.christie@oracle.com> --- drivers/md/dm.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/drivers/md/dm.c b/drivers/md/dm.c index f5cc330bb549..51e34e1a16bb 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -3114,6 +3114,8 @@ struct dm_pr { bool fail_early; int ret; enum pr_type type; + struct pr_keys *read_keys; + struct pr_held_reservation *rsv; }; static int dm_call_pr(struct block_device *bdev, iterate_devices_callout_fn fn, @@ -3346,12 +3348,79 @@ static int dm_pr_clear(struct block_device *bdev, u64 key) return r; } +static int __dm_pr_read_keys(struct dm_target *ti, struct dm_dev *dev, + sector_t start, sector_t len, void *data) +{ + struct dm_pr *pr = data; + const struct pr_ops *ops = dev->bdev->bd_disk->fops->pr_ops; + + if (!ops || !ops->pr_read_keys) { + pr->ret = -EOPNOTSUPP; + return -1; + } + + pr->ret = ops->pr_read_keys(dev->bdev, pr->read_keys); + if (!pr->ret) + return -1; + + return 0; +} + +static int dm_pr_read_keys(struct block_device *bdev, struct pr_keys *keys) +{ + struct dm_pr pr = { + .read_keys = keys, + }; + int ret; + + ret = dm_call_pr(bdev, __dm_pr_read_keys, &pr); + if (ret) + return ret; + + return pr.ret; +} + +static int __dm_pr_read_reservation(struct dm_target *ti, struct dm_dev *dev, + sector_t start, sector_t len, void *data) +{ + struct dm_pr *pr = data; + const struct pr_ops *ops = dev->bdev->bd_disk->fops->pr_ops; + + if (!ops || !ops->pr_read_reservation) { + pr->ret = -EOPNOTSUPP; + return -1; + } + + pr->ret = ops->pr_read_reservation(dev->bdev, pr->rsv); + if (!pr->ret) + return -1; + + return 0; +} + +static int dm_pr_read_reservation(struct block_device *bdev, + struct pr_held_reservation *rsv) +{ + struct dm_pr pr = { + .rsv = rsv, + }; + int ret; + + ret = dm_call_pr(bdev, __dm_pr_read_reservation, &pr); + if (ret) + return ret; + + return pr.ret; +} + static const struct pr_ops dm_pr_ops = { .pr_register = dm_pr_register, .pr_reserve = dm_pr_reserve, .pr_release = dm_pr_release, .pr_preempt = dm_pr_preempt, .pr_clear = dm_pr_clear, + .pr_read_keys = dm_pr_read_keys, + .pr_read_reservation = dm_pr_read_reservation, }; static const struct block_device_operations dm_blk_dops = { -- 2.25.1 -- dm-devel mailing list dm-devel@redhat.com https://listman.redhat.com/mailman/listinfo/dm-devel
next prev parent reply other threads:[~2023-03-24 18:20 UTC|newest] Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-03-24 18:17 [PATCH v5 00/18] Use block pr_ops in LIO Mike Christie 2023-03-24 18:17 ` [dm-devel] " Mike Christie 2023-03-24 18:17 ` [PATCH v5 01/18] block: Add PR callouts for read keys and reservation Mike Christie 2023-03-24 18:17 ` [dm-devel] " Mike Christie 2023-03-24 19:45 ` Bart Van Assche 2023-03-24 19:45 ` [dm-devel] " Bart Van Assche 2023-03-28 16:36 ` Mike Snitzer 2023-03-28 16:36 ` [dm-devel] " Mike Snitzer 2023-03-28 17:11 ` Mike Christie 2023-03-28 17:11 ` [dm-devel] " Mike Christie 2023-03-24 18:17 ` [PATCH v5 02/18] block: Rename BLK_STS_NEXUS to BLK_STS_RESV_CONFLICT Mike Christie 2023-03-24 18:17 ` [dm-devel] " Mike Christie 2023-03-24 19:46 ` Bart Van Assche 2023-03-24 19:46 ` [dm-devel] " Bart Van Assche 2023-03-24 18:17 ` [PATCH v5 03/18] scsi: Rename sd_pr_command Mike Christie 2023-03-24 18:17 ` [dm-devel] " Mike Christie 2023-03-24 19:46 ` Bart Van Assche 2023-03-24 19:46 ` [dm-devel] " Bart Van Assche 2023-03-24 18:17 ` [PATCH v5 04/18] scsi: Move sd_pr_type to header to share Mike Christie 2023-03-24 18:17 ` [dm-devel] " Mike Christie 2023-03-24 18:25 ` Bart Van Assche 2023-03-24 18:25 ` [dm-devel] " Bart Van Assche 2023-03-24 18:41 ` michael.christie 2023-03-24 18:41 ` [dm-devel] " michael.christie 2023-03-24 18:17 ` [PATCH v5 05/18] scsi: Add support for block PR read keys/reservation Mike Christie 2023-03-24 18:17 ` [dm-devel] " Mike Christie 2023-03-24 18:17 ` Mike Christie [this message] 2023-03-24 18:17 ` [dm-devel] [PATCH v5 06/18] dm: " Mike Christie 2023-03-24 18:17 ` [PATCH v5 07/18] nvme: Fix reservation status related structs Mike Christie 2023-03-24 18:17 ` [dm-devel] " Mike Christie 2023-03-24 18:17 ` [PATCH v5 08/18] nvme: Don't hardcode the data len for pr commands Mike Christie 2023-03-24 18:17 ` [dm-devel] " Mike Christie 2023-03-24 18:17 ` [PATCH v5 09/18] nvme: Move pr code to it's own file Mike Christie 2023-03-24 18:17 ` [dm-devel] " Mike Christie 2023-03-24 18:17 ` [PATCH v5 10/18] nvme: Add helper to send pr command Mike Christie 2023-03-24 18:17 ` [dm-devel] " Mike Christie 2023-03-24 18:17 ` [PATCH v5 11/18] nvme: Add pr_ops read_keys support Mike Christie 2023-03-24 18:17 ` [dm-devel] " Mike Christie 2023-03-28 7:11 ` kernel test robot 2023-03-28 7:11 ` [dm-devel] " kernel test robot 2023-03-28 15:50 ` Mike Christie 2023-03-28 15:50 ` [dm-devel] " Mike Christie 2023-03-24 18:17 ` [PATCH v5 12/18] nvme: Add a nvme_pr_type enum Mike Christie 2023-03-24 18:17 ` [dm-devel] " Mike Christie 2023-03-24 18:17 ` [PATCH v5 13/18] nvme: Add pr_ops read_reservation support Mike Christie 2023-03-24 18:17 ` [dm-devel] " Mike Christie 2023-03-24 18:17 ` [PATCH v5 14/18] scsi: target: Rename sbc_ops to exec_cmd_ops Mike Christie 2023-03-24 18:17 ` [dm-devel] " Mike Christie 2023-03-24 18:17 ` [PATCH v5 15/18] scsi: target: Allow backends to hook into PR handling Mike Christie 2023-03-24 18:17 ` [dm-devel] " Mike Christie 2023-03-24 18:17 ` [PATCH v5 16/18] scsi: target: Pass struct target_opcode_descriptor to enabled Mike Christie 2023-03-24 18:17 ` [dm-devel] " Mike Christie 2023-03-24 18:17 ` [PATCH v5 17/18] scsi: target: Report and detect unsupported PR commands Mike Christie 2023-03-24 18:17 ` [dm-devel] " Mike Christie 2023-03-24 18:17 ` [PATCH v5 18/18] scsi: target: Add block PR support to iblock Mike Christie 2023-03-24 18:17 ` [dm-devel] " Mike Christie 2023-04-04 5:29 ` kernel test robot 2023-04-04 5:29 ` [dm-devel] " kernel test robot
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230324181741.13908-7-michael.christie@oracle.com \ --to=michael.christie@oracle.com \ --cc=axboe@kernel.dk \ --cc=bvanassche@acm.org \ --cc=chaitanyak@nvidia.com \ --cc=dm-devel@redhat.com \ --cc=hch@lst.de \ --cc=james.bottomley@hansenpartnership.com \ --cc=kbusch@kernel.org \ --cc=linux-block@vger.kernel.org \ --cc=linux-nvme@lists.infradead.org \ --cc=linux-scsi@vger.kernel.org \ --cc=martin.petersen@oracle.com \ --cc=snitzer@kernel.org \ --cc=target-devel@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.