From: Jarkko Sakkinen <jarkko@kernel.org>
To: Sean Christopherson <seanjc@google.com>
Cc: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
"H. Peter Anvin" <hpa@zytor.com>,
x86@kernel.org, linux-sgx@vger.kernel.org,
linux-kernel@vger.kernel.org,
Jia Zhang <zhang.jia@linux.alibaba.com>
Subject: Re: [PATCH v2] x86/sgx: Remove redundant if conditions in sgx_encl_create
Date: Thu, 21 Jan 2021 02:30:49 +0200 [thread overview]
Message-ID: <YAjLOWvDblzFICS2@kernel.org> (raw)
In-Reply-To: <YAhsyXahEYjV7DZ8@google.com>
On Wed, Jan 20, 2021 at 09:47:53AM -0800, Sean Christopherson wrote:
> On Wed, Jan 20, 2021, Tianjia Zhang wrote:
> > In this scenario, there is no case where va_page is NULL, and
> > the error has been checked. The if condition statement here is
> > redundant, so remove the condition detection.
> >
> > Reported-by: Jia Zhang <zhang.jia@linux.alibaba.com>
> > Suggested-by: Sean Christopherson <seanjc@google.com>
> > Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
> > ---
> > arch/x86/kernel/cpu/sgx/ioctl.c | 9 ++++++---
> > 1 file changed, 6 insertions(+), 3 deletions(-)
> >
> > diff --git a/arch/x86/kernel/cpu/sgx/ioctl.c b/arch/x86/kernel/cpu/sgx/ioctl.c
> > index 1c6ecf9fbeff..efad2fb61c76 100644
> > --- a/arch/x86/kernel/cpu/sgx/ioctl.c
> > +++ b/arch/x86/kernel/cpu/sgx/ioctl.c
> > @@ -66,9 +66,12 @@ static int sgx_encl_create(struct sgx_encl *encl, struct sgx_secs *secs)
> > va_page = sgx_encl_grow(encl);
> > if (IS_ERR(va_page))
> > return PTR_ERR(va_page);
> > - else if (va_page)
> > - list_add(&va_page->list, &encl->va_pages);
> > - /* else the tail page of the VA page list had free slots. */
> > +
> > + if (WARN_ONCE(!va_page,
> > + "the tail page of the VA page list had free slots\n"))
>
> IMO it's worth trimming down the message to keep this on a single line. The
> newline isn't necessary, and this code expects a completely empty list, e.g. it
> can be reworded to something like:
>
> if (WARN_ONCE(!va_page, "non-empty VA page list before ECREATE"))
Agreed. If I recall correctly, these days you can have at least 100
characters per line (if not more, cannot recall the exact number).
/Jarkko
>
> > + return -EIO;
> > +
> > + list_add(&va_page->list, &encl->va_pages);
> >
> > /* The extra page goes to SECS. */
> > encl_size = secs->size + PAGE_SIZE;
> > --
> > 2.19.1.3.ge56e4f7
> >
>
next prev parent reply other threads:[~2021-01-21 0:52 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-20 3:53 [PATCH v2] x86/sgx: Remove redundant if conditions in sgx_encl_create Tianjia Zhang
2021-01-20 17:47 ` Sean Christopherson
2021-01-21 0:30 ` Jarkko Sakkinen [this message]
2021-01-24 6:33 ` Tianjia Zhang
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=YAjLOWvDblzFICS2@kernel.org \
--to=jarkko@kernel.org \
--cc=bp@alien8.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sgx@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=seanjc@google.com \
--cc=tglx@linutronix.de \
--cc=tianjia.zhang@linux.alibaba.com \
--cc=x86@kernel.org \
--cc=zhang.jia@linux.alibaba.com \
/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).