From: "Derrick, Jonathan" <jonathan.derrick@intel.com>
To: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"zub@linux.fjfi.cvut.cz" <zub@linux.fjfi.cvut.cz>,
"linux-block@vger.kernel.org" <linux-block@vger.kernel.org>,
"sbauer@plzdonthack.me" <sbauer@plzdonthack.me>,
"axboe@kernel.dk" <axboe@kernel.dk>
Cc: "jonas.rabenstein@studium.uni-erlangen.de"
<jonas.rabenstein@studium.uni-erlangen.de>
Subject: Re: [PATCH v4 04/16] block: sed-opal: close parameter list in cmd_finalize
Date: Fri, 8 Feb 2019 22:57:31 +0000 [thread overview]
Message-ID: <1549666649.10972.52.camel@intel.com> (raw)
In-Reply-To: <1549054223-12220-5-git-send-email-zub@linux.fjfi.cvut.cz>
[-- Attachment #1: Type: text/plain, Size: 7275 bytes --]
Normally I wouldn't like decreasing the readability (having a STARTLIST
without an ENDLIST in the same function), but this makes a lot of sense
with 5/16
Acked-by: Jon Derrick <jonathan.derrick@intel.com>
On Fri, 2019-02-01 at 21:50 +0100, David Kozub wrote:
> Every step ends by calling cmd_finalize (via finalize_and_send)
> yet every step adds the token OPAL_ENDLIST on its own. Moving
> this into cmd_finalize decreases code duplication.
>
> Co-authored-by: Jonas Rabenstein <jonas.rabenstein@studium.uni-erlangen.de>
> Signed-off-by: David Kozub <zub@linux.fjfi.cvut.cz>
> Signed-off-by: Jonas Rabenstein <jonas.rabenstein@studium.uni-erlangen.de>
> Reviewed-by: Scott Bauer <sbauer@plzdonthack.me>
> ---
> block/sed-opal.c | 25 +++----------------------
> 1 file changed, 3 insertions(+), 22 deletions(-)
>
> diff --git a/block/sed-opal.c b/block/sed-opal.c
> index 980705681806..35b1747b650f 100644
> --- a/block/sed-opal.c
> +++ b/block/sed-opal.c
> @@ -661,6 +661,9 @@ static int cmd_finalize(struct opal_dev *cmd, u32 hsn, u32 tsn)
> struct opal_header *hdr;
> int err = 0;
>
> + /* close parameter list */
> + add_token_u8(&err, cmd, OPAL_ENDLIST);
> +
> add_token_u8(&err, cmd, OPAL_ENDOFDATA);
> add_token_u8(&err, cmd, OPAL_STARTLIST);
> add_token_u8(&err, cmd, 0);
> @@ -1079,7 +1082,6 @@ static int gen_key(struct opal_dev *dev, void *data)
> add_token_bytestring(&err, dev, opalmethod[OPAL_GENKEY],
> OPAL_UID_LENGTH);
> add_token_u8(&err, dev, OPAL_STARTLIST);
> - add_token_u8(&err, dev, OPAL_ENDLIST);
>
> if (err) {
> pr_debug("Error building gen key command\n");
> @@ -1142,7 +1144,6 @@ static int get_active_key(struct opal_dev *dev, void *data)
> add_token_u8(&err, dev, 10); /* ActiveKey */
> add_token_u8(&err, dev, OPAL_ENDNAME);
> add_token_u8(&err, dev, OPAL_ENDLIST);
> - add_token_u8(&err, dev, OPAL_ENDLIST);
> if (err) {
> pr_debug("Error building get active key command\n");
> return err;
> @@ -1188,7 +1189,6 @@ static int generic_lr_enable_disable(struct opal_dev *dev,
>
> add_token_u8(&err, dev, OPAL_ENDLIST);
> add_token_u8(&err, dev, OPAL_ENDNAME);
> - add_token_u8(&err, dev, OPAL_ENDLIST);
> return err;
> }
>
> @@ -1254,8 +1254,6 @@ static int setup_locking_range(struct opal_dev *dev, void *data)
>
> add_token_u8(&err, dev, OPAL_ENDLIST);
> add_token_u8(&err, dev, OPAL_ENDNAME);
> - add_token_u8(&err, dev, OPAL_ENDLIST);
> -
> }
> if (err) {
> pr_debug("Error building Setup Locking range command.\n");
> @@ -1295,7 +1293,6 @@ static int start_generic_opal_session(struct opal_dev *dev,
>
> switch (auth) {
> case OPAL_ANYBODY_UID:
> - add_token_u8(&err, dev, OPAL_ENDLIST);
> break;
> case OPAL_ADMIN1_UID:
> case OPAL_SID_UID:
> @@ -1308,7 +1305,6 @@ static int start_generic_opal_session(struct opal_dev *dev,
> add_token_bytestring(&err, dev, opaluid[auth],
> OPAL_UID_LENGTH);
> add_token_u8(&err, dev, OPAL_ENDNAME);
> - add_token_u8(&err, dev, OPAL_ENDLIST);
> break;
> default:
> pr_debug("Cannot start Admin SP session with auth %d\n", auth);
> @@ -1406,7 +1402,6 @@ static int start_auth_opal_session(struct opal_dev *dev, void *data)
> add_token_u8(&err, dev, 3);
> add_token_bytestring(&err, dev, lk_ul_user, OPAL_UID_LENGTH);
> add_token_u8(&err, dev, OPAL_ENDNAME);
> - add_token_u8(&err, dev, OPAL_ENDLIST);
>
> if (err) {
> pr_debug("Error building STARTSESSION command.\n");
> @@ -1429,7 +1424,6 @@ static int revert_tper(struct opal_dev *dev, void *data)
> add_token_bytestring(&err, dev, opalmethod[OPAL_REVERT],
> OPAL_UID_LENGTH);
> add_token_u8(&err, dev, OPAL_STARTLIST);
> - add_token_u8(&err, dev, OPAL_ENDLIST);
> if (err) {
> pr_debug("Error building REVERT TPER command.\n");
> return err;
> @@ -1463,7 +1457,6 @@ static int internal_activate_user(struct opal_dev *dev, void *data)
> add_token_u8(&err, dev, OPAL_ENDNAME);
> add_token_u8(&err, dev, OPAL_ENDLIST);
> add_token_u8(&err, dev, OPAL_ENDNAME);
> - add_token_u8(&err, dev, OPAL_ENDLIST);
>
> if (err) {
> pr_debug("Error building Activate UserN command.\n");
> @@ -1490,7 +1483,6 @@ static int erase_locking_range(struct opal_dev *dev, void *data)
> add_token_bytestring(&err, dev, opalmethod[OPAL_ERASE],
> OPAL_UID_LENGTH);
> add_token_u8(&err, dev, OPAL_STARTLIST);
> - add_token_u8(&err, dev, OPAL_ENDLIST);
>
> if (err) {
> pr_debug("Error building Erase Locking Range Command.\n");
> @@ -1521,7 +1513,6 @@ static int set_mbr_done(struct opal_dev *dev, void *data)
> add_token_u8(&err, dev, OPAL_ENDNAME);
> add_token_u8(&err, dev, OPAL_ENDLIST);
> add_token_u8(&err, dev, OPAL_ENDNAME);
> - add_token_u8(&err, dev, OPAL_ENDLIST);
>
> if (err) {
> pr_debug("Error Building set MBR Done command\n");
> @@ -1553,7 +1544,6 @@ static int set_mbr_enable_disable(struct opal_dev *dev, void *data)
> add_token_u8(&err, dev, OPAL_ENDNAME);
> add_token_u8(&err, dev, OPAL_ENDLIST);
> add_token_u8(&err, dev, OPAL_ENDNAME);
> - add_token_u8(&err, dev, OPAL_ENDLIST);
>
> if (err) {
> pr_debug("Error Building set MBR done command\n");
> @@ -1585,7 +1575,6 @@ static int generic_pw_cmd(u8 *key, size_t key_len, u8 *cpin_uid,
> add_token_u8(&err, dev, OPAL_ENDNAME);
> add_token_u8(&err, dev, OPAL_ENDLIST);
> add_token_u8(&err, dev, OPAL_ENDNAME);
> - add_token_u8(&err, dev, OPAL_ENDLIST);
>
> return err;
> }
> @@ -1694,7 +1683,6 @@ static int add_user_to_lr(struct opal_dev *dev, void *data)
> add_token_u8(&err, dev, OPAL_ENDNAME);
> add_token_u8(&err, dev, OPAL_ENDLIST);
> add_token_u8(&err, dev, OPAL_ENDNAME);
> - add_token_u8(&err, dev, OPAL_ENDLIST);
>
> if (err) {
> pr_debug("Error building add user to locking range command.\n");
> @@ -1755,7 +1743,6 @@ static int lock_unlock_locking_range(struct opal_dev *dev, void *data)
>
> add_token_u8(&err, dev, OPAL_ENDLIST);
> add_token_u8(&err, dev, OPAL_ENDNAME);
> - add_token_u8(&err, dev, OPAL_ENDLIST);
>
> if (err) {
> pr_debug("Error building SET command.\n");
> @@ -1843,11 +1830,8 @@ static int activate_lsp(struct opal_dev *dev, void *data)
> }
> add_token_u8(&err, dev, OPAL_ENDLIST);
> add_token_u8(&err, dev, OPAL_ENDNAME);
> - add_token_u8(&err, dev, OPAL_ENDLIST);
> -
> } else {
> add_token_u8(&err, dev, OPAL_STARTLIST);
> - add_token_u8(&err, dev, OPAL_ENDLIST);
> }
>
> if (err) {
> @@ -1904,7 +1888,6 @@ static int get_lsp_lifecycle(struct opal_dev *dev, void *data)
> add_token_u8(&err, dev, 6); /* Lifecycle Column */
> add_token_u8(&err, dev, OPAL_ENDNAME);
>
> - add_token_u8(&err, dev, OPAL_ENDLIST);
> add_token_u8(&err, dev, OPAL_ENDLIST);
>
> if (err) {
> @@ -1964,8 +1947,6 @@ static int get_msid_cpin_pin(struct opal_dev *dev, void *data)
> add_token_u8(&err, dev, 4); /* End Column */
> add_token_u8(&err, dev, 3); /* Lifecycle Column */
> add_token_u8(&err, dev, OPAL_ENDNAME);
> -
> - add_token_u8(&err, dev, OPAL_ENDLIST);
> add_token_u8(&err, dev, OPAL_ENDLIST);
>
> if (err) {
[-- Attachment #2: smime.p7s --]
[-- Type: application/x-pkcs7-signature, Size: 3278 bytes --]
next prev parent reply other threads:[~2019-02-08 22:57 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-01 20:50 [PATCH v4 00/16] block: sed-opal: support shadow MBR done flag and write David Kozub
2019-02-01 20:50 ` [PATCH v4 01/16] block: sed-opal: fix typos and formatting David Kozub
2019-02-04 14:42 ` Christoph Hellwig
2019-02-04 20:28 ` David Kozub
2019-02-08 22:56 ` Derrick, Jonathan
2019-02-01 20:50 ` [PATCH v4 02/16] block: sed-opal: use correct macro for method length David Kozub
2019-02-04 14:43 ` Christoph Hellwig
2019-02-08 22:56 ` Derrick, Jonathan
2019-02-01 20:50 ` [PATCH v4 03/16] block: sed-opal: unify space check in add_token_* David Kozub
2019-02-04 14:44 ` Christoph Hellwig
2019-02-04 21:07 ` David Kozub
2019-02-04 21:09 ` Christoph Hellwig
2019-02-08 22:57 ` Derrick, Jonathan
2019-02-01 20:50 ` [PATCH v4 04/16] block: sed-opal: close parameter list in cmd_finalize David Kozub
2019-02-04 14:44 ` Christoph Hellwig
2019-02-08 22:57 ` Derrick, Jonathan [this message]
2019-02-01 20:50 ` [PATCH v4 05/16] block: sed-opal: unify cmd start David Kozub
2019-02-04 14:45 ` Christoph Hellwig
2019-02-08 22:57 ` Derrick, Jonathan
2019-02-01 20:50 ` [PATCH v4 06/16] block: sed-opal: unify error handling of responses David Kozub
2019-02-04 14:45 ` Christoph Hellwig
2019-02-01 20:50 ` [PATCH v4 07/16] block: sed-opal: reuse response_get_token to decrease code duplication David Kozub
2019-02-04 14:46 ` Christoph Hellwig
2019-02-08 22:57 ` Derrick, Jonathan
2019-02-01 20:50 ` [PATCH v4 08/16] block: sed-opal: print failed function address David Kozub
2019-02-04 14:46 ` Christoph Hellwig
2019-02-01 20:50 ` [PATCH v4 09/16] block: sed-opal: split generation of bytestring header and content David Kozub
2019-02-04 14:48 ` Christoph Hellwig
2019-02-08 22:58 ` Derrick, Jonathan
2019-02-01 20:50 ` [PATCH v4 10/16] block: sed-opal: add ioctl for done-mark of shadow mbr David Kozub
2019-02-04 14:52 ` Christoph Hellwig
2019-02-07 22:56 ` David Kozub
2019-02-08 0:44 ` Derrick, Jonathan
2019-02-08 1:37 ` Scott Bauer
2019-02-10 18:26 ` Scott Bauer
2019-02-10 20:25 ` David Kozub
2019-02-01 20:50 ` [PATCH v4 11/16] block: sed-opal: ioctl for writing to " David Kozub
2019-02-04 17:58 ` kbuild test robot
2019-02-08 22:58 ` Derrick, Jonathan
2019-02-01 20:50 ` [PATCH v4 12/16] block: sed-opal: unify retrieval of table columns David Kozub
2019-02-04 14:56 ` Christoph Hellwig
2019-02-08 22:58 ` Derrick, Jonathan
2019-02-01 20:50 ` [PATCH v4 13/16] block: sed-opal: check size of shadow mbr David Kozub
2019-02-08 22:58 ` Derrick, Jonathan
2019-02-10 20:05 ` David Kozub
2019-02-11 21:27 ` Derrick, Jonathan
2019-02-01 20:50 ` [PATCH v4 14/16] block: sed-opal: pass steps via argument rather than via opal_dev David Kozub
2019-02-04 14:57 ` Christoph Hellwig
2019-02-01 20:50 ` [PATCH v4 15/16] block: sed-opal: don't repeat opal_discovery0 in each steps array David Kozub
2019-02-04 15:01 ` Christoph Hellwig
2019-02-04 22:44 ` David Kozub
2019-02-08 22:59 ` Derrick, Jonathan
2019-02-10 17:46 ` David Kozub
2019-02-11 17:22 ` Derrick, Jonathan
2019-02-01 20:50 ` [PATCH v4 16/16] block: sed-opal: rename next to execute_steps David Kozub
2019-02-04 15:01 ` Christoph Hellwig
2019-02-08 22:59 ` Derrick, Jonathan
2019-02-04 8:55 ` David Kozub
2019-02-04 9:44 ` [PATCH v4 00/16] block: sed-opal: support shadow MBR done flag and write David Kozub
2019-02-04 15:04 ` Christoph Hellwig
2019-02-04 15:36 ` Scott Bauer
2019-02-04 15:44 ` Christoph Hellwig
2019-02-04 23:06 ` David Kozub
2019-02-05 6:57 ` Christoph Hellwig
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=1549666649.10972.52.camel@intel.com \
--to=jonathan.derrick@intel.com \
--cc=axboe@kernel.dk \
--cc=jonas.rabenstein@studium.uni-erlangen.de \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sbauer@plzdonthack.me \
--cc=zub@linux.fjfi.cvut.cz \
/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;
as well as URLs for NNTP newsgroup(s).