From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AD882C38A2A for ; Thu, 7 May 2020 13:36:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8812C2073A for ; Thu, 7 May 2020 13:36:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588858615; bh=LzQDOyhUPzaN/QEmH/5Zc/cFyUE1+mfVuXz0rvZ8LqA=; h=Date:From:To:cc:Subject:In-Reply-To:References:List-ID:From; b=QsWO6FgqWeWuImRtfGmOVGGBxTFbdSiblALjSlIsRVwg53ORdJZAEHCt+uNZ8wfmj 12fDilP3q2E17BdHMBwXVebLPzT4Y8KoDxvcXZwOMk+yor67Wt92XVRH7W/Kb8e1x8 /yXM1qqE5emxVoNGQkuApRbi4xPsqekCaeSOy4WI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725939AbgEGNgw (ORCPT ); Thu, 7 May 2020 09:36:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:49012 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725879AbgEGNgw (ORCPT ); Thu, 7 May 2020 09:36:52 -0400 Received: from pobox.suse.cz (nat1.prg.suse.com [195.250.132.148]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id F100B20643; Thu, 7 May 2020 13:36:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588858611; bh=LzQDOyhUPzaN/QEmH/5Zc/cFyUE1+mfVuXz0rvZ8LqA=; h=Date:From:To:cc:Subject:In-Reply-To:References:From; b=eStuCrUmYvOzkkb/b4gwo9EssNgSWMvVXNQfMmAmE3/4XYZlvs7S40Q9uCK3FyII/ ZUug+OReaOaXNuqa34GONmSGK97EHYDBrdlFU/G7dNy+eRUj4oFGLGIdAGWICWyr8+ a4mkZ7utRJPgqiGk8/ZqsQ1Uz8FrYTdz2jtWB8y8= Date: Thu, 7 May 2020 15:36:48 +0200 (CEST) From: Jiri Kosina To: Josh Poimboeuf cc: live-patching@vger.kernel.org, linux-kernel@vger.kernel.org, Peter Zijlstra , Jessica Yu , Joe Lawrence , Miroslav Benes , linux-s390@vger.kernel.org, heiko.carstens@de.ibm.com, Gerald Schaefer Subject: Re: [PATCH v4 05/11] s390: Change s390_kernel_write() return type to match memcpy() In-Reply-To: Message-ID: References: User-Agent: Alpine 2.21 (LSU 202 2017-01-01) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Sender: live-patching-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: live-patching@vger.kernel.org On Wed, 29 Apr 2020, Josh Poimboeuf wrote: > s390_kernel_write()'s function type is almost identical to memcpy(). > Change its return type to "void *" so they can be used interchangeably. > > Cc: linux-s390@vger.kernel.org > Cc: heiko.carstens@de.ibm.com > Signed-off-by: Josh Poimboeuf > Acked-by: Joe Lawrence > Acked-by: Miroslav Benes Also for this one -- s390 folks, could you please provide your Ack for taking things through livepatching.git as part of this series? Thanks. > --- > arch/s390/include/asm/uaccess.h | 2 +- > arch/s390/mm/maccess.c | 9 ++++++--- > 2 files changed, 7 insertions(+), 4 deletions(-) > > diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h > index a470f1fa9f2a..324438889fe1 100644 > --- a/arch/s390/include/asm/uaccess.h > +++ b/arch/s390/include/asm/uaccess.h > @@ -276,6 +276,6 @@ static inline unsigned long __must_check clear_user(void __user *to, unsigned lo > } > > int copy_to_user_real(void __user *dest, void *src, unsigned long count); > -void s390_kernel_write(void *dst, const void *src, size_t size); > +void *s390_kernel_write(void *dst, const void *src, size_t size); > > #endif /* __S390_UACCESS_H */ > diff --git a/arch/s390/mm/maccess.c b/arch/s390/mm/maccess.c > index de7ca4b6718f..22a0be655f27 100644 > --- a/arch/s390/mm/maccess.c > +++ b/arch/s390/mm/maccess.c > @@ -55,19 +55,22 @@ static notrace long s390_kernel_write_odd(void *dst, const void *src, size_t siz > */ > static DEFINE_SPINLOCK(s390_kernel_write_lock); > > -void notrace s390_kernel_write(void *dst, const void *src, size_t size) > +notrace void *s390_kernel_write(void *dst, const void *src, size_t size) > { > + void *tmp = dst; > unsigned long flags; > long copied; > > spin_lock_irqsave(&s390_kernel_write_lock, flags); > while (size) { > - copied = s390_kernel_write_odd(dst, src, size); > - dst += copied; > + copied = s390_kernel_write_odd(tmp, src, size); > + tmp += copied; > src += copied; > size -= copied; > } > spin_unlock_irqrestore(&s390_kernel_write_lock, flags); > + > + return dst; > } > > static int __no_sanitize_address __memcpy_real(void *dest, void *src, size_t count) > -- > 2.21.1 > -- Jiri Kosina SUSE Labs