Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Mon, 18 Jul 2022 16:51:59 +0200
From:   Alexander Gordeev <agordeev@linux.ibm.com>
To:     Matthew Wilcox <willy@infradead.org>
Cc:     Alexander Egorenkov <egorenar@linux.ibm.com>,
        Heiko Carstens <hca@linux.ibm.com>,
        Baoquan He <bhe@redhat.com>, Christoph Hellwig <hch@lst.de>,
        Vasily Gorbik <gor@linux.ibm.com>,
        Al Viro <viro@zeniv.linux.org.uk>,
        linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org
Subject: Re: [PATCH v3 2/3] s390/crash: use static swap buffer for
 copy_to_user_real()
Message-ID: <YtVzj5W5xr/UwjLT@li-4a3a4a4c-28e5-11b2-a85c-a8d192c6f089.ibm.com>
References: <cover.1658148067.git.agordeev@linux.ibm.com>
 <77d50b4a2359d1791835b6111edaa155eb11c5ea.1658148067.git.agordeev@linux.ibm.com>
 <YtVkpRJ7jvLFuKs4@casper.infradead.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <YtVkpRJ7jvLFuKs4@casper.infradead.org>
Precedence: bulk

On Mon, Jul 18, 2022 at 02:48:21PM +0100, Matthew Wilcox wrote:
> On Mon, Jul 18, 2022 at 03:32:40PM +0200, Alexander Gordeev wrote:
> > +++ b/arch/s390/kernel/crash_dump.c
> > @@ -53,6 +53,7 @@ struct save_area {
> >  };
> >  
> >  static LIST_HEAD(dump_save_areas);
> 
> I'd suggest you need a mutex here so that simultaneous calls to
> copy_to_user_real() don't corrupt each others data.

We stop all (but one) CPUs before calling into the capture kernel -
one that calls these functions. Similarily to racy hsa_buf[] access
from memcpy_hsa_iter() this should not hit.

As you noticed last time, it is a pre-existing race and I was
actually going to address it in a separate fix - if the problem
really exists.

> > +static char memcpy_real_buf[PAGE_SIZE];
> >  
> >  /*
> >   * Allocate a save area
> > @@ -179,23 +180,18 @@ int copy_oldmem_kernel(void *dst, unsigned long src, size_t count)
> >  static int copy_to_user_real(void __user *dest, unsigned long src, unsigned long count)
> >  {
> >  	int offs = 0, size, rc;
> > -	char *buf;
> >  
> > -	buf = (char *)__get_free_page(GFP_KERNEL);
> > -	if (!buf)
> > -		return -ENOMEM;
> >  	rc = -EFAULT;
> >  	while (offs < count) {
> >  		size = min(PAGE_SIZE, count - offs);
> > -		if (memcpy_real(buf, src + offs, size))
> > +		if (memcpy_real(memcpy_real_buf, src + offs, size))
> >  			goto out;
> > -		if (copy_to_user(dest + offs, buf, size))
> > +		if (copy_to_user(dest + offs, memcpy_real_buf, size))
> >  			goto out;
> >  		offs += size;
> >  	}
> >  	rc = 0;
> >  out:
> > -	free_page((unsigned long)buf);
> >  	return rc;
> >  }

Thanks!