Message-ID: <6d870c61856f84c9c48262eecf9001012163edbb.camel@linux.ibm.com>
Subject: Re: [PATCH v6 08/14] KVM: s390: Move common code of mem_op
 functions into functions
From:   Janis Schoetterl-Glausch <scgl@linux.ibm.com>
To:     Janosch Frank <frankja@linux.ibm.com>,
        Thomas Huth <thuth@redhat.com>,
        Christian Borntraeger <borntraeger@linux.ibm.com>,
        Claudio Imbrenda <imbrenda@linux.ibm.com>,
        Heiko Carstens <hca@linux.ibm.com>,
        Vasily Gorbik <gor@linux.ibm.com>,
        Alexander Gordeev <agordeev@linux.ibm.com>
Cc:     David Hildenbrand <david@redhat.com>,
        Jonathan Corbet <corbet@lwn.net>, kvm@vger.kernel.org,
        linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
        linux-kselftest@vger.kernel.org, linux-s390@vger.kernel.org,
        Paolo Bonzini <pbonzini@redhat.com>,
        Shuah Khan <shuah@kernel.org>,
        Sven Schnelle <svens@linux.ibm.com>
Date:   Thu, 26 Jan 2023 17:47:43 +0100
In-Reply-To: <dbd8204a-5413-b593-7ede-1c5ea7ee4425@linux.ibm.com>
References: <20230125212608.1860251-1-scgl@linux.ibm.com>
         <20230125212608.1860251-9-scgl@linux.ibm.com>
         <a1141cf5-8c44-5e9e-688c-c9dab3ebe8d4@redhat.com>
         <dbd8204a-5413-b593-7ede-1c5ea7ee4425@linux.ibm.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
User-Agent: Evolution 3.46.3 (3.46.3-1.fc37) 
MIME-Version: 1.0
Precedence: bulk

On Thu, 2023-01-26 at 14:02 +0100, Janosch Frank wrote:
> On 1/26/23 07:48, Thomas Huth wrote:
> > On 25/01/2023 22.26, Janis Schoetterl-Glausch wrote:
> > > The vcpu and vm mem_op ioctl implementations share some functionality=
.
> > > Move argument checking and buffer allocation into functions and call
> > > them from both implementations.
> > > This allows code reuse in case of additional future mem_op operations=
.
> > >=20
> > > Suggested-by: Janosch Frank <frankja@linux.ibm.com>
> > > Signed-off-by: Janis Schoetterl-Glausch <scgl@linux.ibm.com>
> > > ---
> > >    arch/s390/kvm/kvm-s390.c | 80 +++++++++++++++++++++---------------=
----
> > >    1 file changed, 42 insertions(+), 38 deletions(-)
> > >=20
> > > diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
> > > index e4890e04b210..e0dfaa195949 100644
> > > --- a/arch/s390/kvm/kvm-s390.c
> > > +++ b/arch/s390/kvm/kvm-s390.c
> > > @@ -2764,24 +2764,44 @@ static int kvm_s390_handle_pv(struct kvm *kvm=
, struct kvm_pv_cmd *cmd)
> > >    	return r;
> > >    }
> > >   =20
> > > -static bool access_key_invalid(u8 access_key)
> > > +static int mem_op_validate_common(struct kvm_s390_mem_op *mop, u64 s=
upported_flags)
> > >    {
> > > -	return access_key > 0xf;
> > > +	if (mop->flags & ~supported_flags || !mop->size)
> > > +		return -EINVAL;
> > > +	if (mop->size > MEM_OP_MAX_SIZE)
> > > +		return -E2BIG;
> > > +	if (mop->flags & KVM_S390_MEMOP_F_SKEY_PROTECTION) {
> > > +		if (mop->key > 0xf)
> > > +			return -EINVAL;
> > > +	} else {
> > > +		mop->key =3D 0;
> > > +	}
> > > +	return 0;
> > > +}
> > > +
> > > +static void *mem_op_alloc_buf(struct kvm_s390_mem_op *mop)
> > > +{
> > > +	void *buf;
> > > +
> > > +	if (mop->flags & KVM_S390_MEMOP_F_CHECK_ONLY)
> > > +		return NULL;
> > > +	buf =3D vmalloc(mop->size);
> > > +	if (!buf)
> > > +		return ERR_PTR(-ENOMEM);
> > > +	return buf;
> > >    }
> > >   =20
> > >    static int kvm_s390_vm_mem_op(struct kvm *kvm, struct kvm_s390_mem=
_op *mop)
> > >    {
> > >    	void __user *uaddr =3D (void __user *)mop->buf;
> > > -	u64 supported_flags;
> > >    	void *tmpbuf =3D NULL;
> >=20
> > You likely can now remove the "=3D NULL" here, I guess?
> >=20
> > >    	int r, srcu_idx;
> > >   =20
> > > -	supported_flags =3D KVM_S390_MEMOP_F_SKEY_PROTECTION
> > > -			  | KVM_S390_MEMOP_F_CHECK_ONLY;
> > > -	if (mop->flags & ~supported_flags || !mop->size)
> > > -		return -EINVAL;
> > > -	if (mop->size > MEM_OP_MAX_SIZE)
> > > -		return -E2BIG;
> > > +	r =3D mem_op_validate_common(mop, KVM_S390_MEMOP_F_SKEY_PROTECTION =
|
> > > +					KVM_S390_MEMOP_F_CHECK_ONLY);
> > > +	if (r)
> > > +		return r;
> > > +
> > >    	/*
> > >    	 * This is technically a heuristic only, if the kvm->lock is not
> > >    	 * taken, it is not guaranteed that the vm is/remains non-protect=
ed.
> > > @@ -2793,17 +2813,9 @@ static int kvm_s390_vm_mem_op(struct kvm *kvm,=
 struct kvm_s390_mem_op *mop)
> > >    	 */
> > >    	if (kvm_s390_pv_get_handle(kvm))
> > >    		return -EINVAL;
> > > -	if (mop->flags & KVM_S390_MEMOP_F_SKEY_PROTECTION) {
> > > -		if (access_key_invalid(mop->key))
> > > -			return -EINVAL;
> > > -	} else {
> > > -		mop->key =3D 0;
> > > -	}
> > > -	if (!(mop->flags & KVM_S390_MEMOP_F_CHECK_ONLY)) {
> > > -		tmpbuf =3D vmalloc(mop->size);
> > > -		if (!tmpbuf)
> > > -			return -ENOMEM;
> > > -	}
> > > +	tmpbuf =3D mem_op_alloc_buf(mop);
> > > +	if (IS_ERR(tmpbuf))
> > > +		return PTR_ERR(tmpbuf);
> > >   =20
> > >    	srcu_idx =3D srcu_read_lock(&kvm->srcu);
> > >   =20
> > > @@ -5250,28 +5262,20 @@ static long kvm_s390_vcpu_mem_op(struct kvm_v=
cpu *vcpu,
> > >    {
> > >    	void __user *uaddr =3D (void __user *)mop->buf;
> > >    	void *tmpbuf =3D NULL;
> >=20
> > ... and here, too.
> >=20
> > But I have to admit that I'm also not sure whether I like the
> > mem_op_alloc_buf() part or not (the mem_op_validate_common() part looks=
 fine
> > to me) : mem_op_alloc_buf() is a new function with 11 lines of code, an=
d the
> > old spots that allocate memory were only 5 lines of code each, so you n=
ow
> > increased the LoC count and additionally have to fiddly with IS_ERR and
> > PTR_ERR which is always a little bit ugly in my eyes ... IMHO I'd rathe=
r
> > keep the old code here. But that's just my 0.02 =E2=82=AC, if you think=
 it's nicer
> > with mem_op_alloc_buf(), I won't insist on keeping the old code.
> >=20
> >    Thomas
> >=20
>=20
> I've done a PoC that has a **buff argument and combines the check with=
=20
> the alloc.

I just didn't like that much because it felt like an unspecific memop_do_th=
ings function.