From: Chaitanya Kulkarni <kch@nvidia.com>
To: <hare@suse.de>
Cc: <linux-nvme@lists.infradead.org>, <hch@lst.de>,
<sagi@grimberg.me>, Chaitanya Kulkarni <kch@nvidia.com>
Subject: [PATCH 3/3] nvmet-auth: use helper for auth send/recv cmd prep
Date: Mon, 22 May 2023 01:37:13 -0700 [thread overview]
Message-ID: <20230522083713.107001-4-kch@nvidia.com> (raw)
In-Reply-To: <20230522083713.107001-1-kch@nvidia.com>
Add a common helper to factor out secp/spsp values check and transfer
buffer allocation in nvmet_execute_auth_send() and
nvmet_execute_auth_receive().
Signed-off-by: Chaitanya Kulkarni <kch@nvidia.com>
---
drivers/nvme/target/fabrics-cmd-auth.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/drivers/nvme/target/fabrics-cmd-auth.c b/drivers/nvme/target/fabrics-cmd-auth.c
index ad8e914ae56f..8200265734e1 100644
--- a/drivers/nvme/target/fabrics-cmd-auth.c
+++ b/drivers/nvme/target/fabrics-cmd-auth.c
@@ -41,6 +41,13 @@ static u16 nvmet_auth_alloc_transfer_buffer(struct nvmet_req *req, void **buf,
return *buf ? NVME_SC_SUCCESS : NVME_SC_INTERNAL;
}
+static u16 nvmet_auth_common_prep(struct nvmet_req *req, void **buf, u32 *len)
+{
+ u16 sts = nvmet_auth_check_secp_spsp(req);
+
+ return sts ? sts : nvmet_auth_alloc_transfer_buffer(req, buf, len);
+}
+
static void nvmet_auth_expired_work(struct work_struct *work)
{
struct nvmet_sq *sq = container_of(to_delayed_work(work),
@@ -216,10 +223,7 @@ void nvmet_execute_auth_send(struct nvmet_req *req)
u32 tl;
u16 status;
- status = nvmet_auth_check_secp_spsp(req);
- if (status)
- goto done;
- status = nvmet_auth_alloc_transfer_buffer(req, &d, &tl);
+ status = nvmet_auth_common_prep(req, &d, &tl);
if (status)
goto done;
@@ -440,10 +444,7 @@ void nvmet_execute_auth_receive(struct nvmet_req *req)
u32 al;
u16 status;
- status = nvmet_auth_check_secp_spsp(req);
- if (status)
- goto done;
- status = nvmet_auth_alloc_transfer_buffer(req, &d, &al);
+ status = nvmet_auth_common_prep(req, &d, &al);
if (status)
goto done;
if (!nvmet_check_transfer_len(req, al)) {
--
2.40.0
next prev parent reply other threads:[~2023-05-22 8:38 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-22 8:37 [PATCH 0/3] nvmet-auth: auth send / receive cleanup Chaitanya Kulkarni
2023-05-22 8:37 ` [PATCH 1/3] nvmet-auth: use common helper to check secp/spsp Chaitanya Kulkarni
2023-05-23 6:55 ` Christoph Hellwig
2023-05-22 8:37 ` [PATCH 2/3] nvmet_auth: use common helper for buffer alloc Chaitanya Kulkarni
2023-05-23 6:56 ` Christoph Hellwig
2023-05-22 8:37 ` Chaitanya Kulkarni [this message]
2023-05-23 6:56 ` [PATCH 3/3] nvmet-auth: use helper for auth send/recv cmd prep Christoph Hellwig
2023-05-23 8:33 ` Chaitanya Kulkarni
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=20230522083713.107001-4-kch@nvidia.com \
--to=kch@nvidia.com \
--cc=hare@suse.de \
--cc=hch@lst.de \
--cc=linux-nvme@lists.infradead.org \
--cc=sagi@grimberg.me \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox