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,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham 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 4F810C433DF for ; Thu, 18 Jun 2020 11:52:14 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 0F7D22073E for ; Thu, 18 Jun 2020 11:52:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="EenphTcN" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0F7D22073E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 94FF56B0025; Thu, 18 Jun 2020 07:52:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 900966B0027; Thu, 18 Jun 2020 07:52:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 815A46B002A; Thu, 18 Jun 2020 07:52:13 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0159.hostedemail.com [216.40.44.159]) by kanga.kvack.org (Postfix) with ESMTP id 683506B0025 for ; Thu, 18 Jun 2020 07:52:13 -0400 (EDT) Received: from smtpin27.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id E2F89356B for ; Thu, 18 Jun 2020 11:52:12 +0000 (UTC) X-FDA: 76942169304.27.ink98_2a0c95626e10 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin27.hostedemail.com (Postfix) with ESMTP id B38203D668 for ; Thu, 18 Jun 2020 11:52:12 +0000 (UTC) X-HE-Tag: ink98_2a0c95626e10 X-Filterd-Recvd-Size: 4783 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf28.hostedemail.com (Postfix) with ESMTP for ; Thu, 18 Jun 2020 11:52:12 +0000 (UTC) Received: from willie-the-truck (236.31.169.217.in-addr.arpa [217.169.31.236]) (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 B4FD720706; Thu, 18 Jun 2020 11:52:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592481131; bh=wTfRxuKc1jwLXftAH31BnUg/H44ZLv/8YpTzgFciB8Y=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=EenphTcNyB+dKYaoGyJ/fNyX0l+r6YROK2HBb8+nCr3mZ48i1aUZ7yLvXIZJLoCog arzhVttP19B2KO0Fmwt9w4Z6Z3MRQ8a+HAJokg4Jxv9xgWQyfdXbj7HkictVvvQeTG 6F2NDFPA8kyBrvuJ8Q21VRKJA2OM6gw6rzGGPaoU= Date: Thu, 18 Jun 2020 12:52:02 +0100 From: Will Deacon To: Heiko Carstens Cc: Xiaoming Ni , acme@kernel.org, alexander.shishkin@linux.intel.com, arnd@arndb.de, borntraeger@de.ibm.com, catalin.marinas@arm.com, christian@brauner.io, cyphar@cyphar.com, dhowells@redhat.com, ebiederm@xmission.com, fenghua.yu@intel.com, geert@linux-m68k.org, gor@linux.ibm.com, ink@jurassic.park.msu.ru, jolsa@redhat.com, linux@armlinux.org.uk, lkp@intel.com, mark.rutland@arm.com, mattst88@gmail.com, minchan@kernel.org, mingo@redhat.com, monstr@monstr.eu, namhyung@kernel.org, peterz@infradead.org, rth@twiddle.net, sargun@sargun.me, sfr@canb.auug.org.au, tony.luck@intel.com, akpm@linux-foundation.org, alex.huangjianhui@huawei.com, zhongjubin@huawei.com, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, clang-built-linux@googlegroups.com, kbuild-all@lists.01.org, linux-mm@kvack.org Subject: Re: [PATCH] s390: fix build error for sys_call_table_emu Message-ID: <20200618115201.GA5671@willie-the-truck> References: <20200618110320.104013-1-nixiaoming@huawei.com> <20200618112702.GB4231@osiris> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200618112702.GB4231@osiris> User-Agent: Mutt/1.10.1 (2018-07-13) X-Rspamd-Queue-Id: B38203D668 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam03 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Thu, Jun 18, 2020 at 01:27:02PM +0200, Heiko Carstens wrote: > On Thu, Jun 18, 2020 at 07:03:20PM +0800, Xiaoming Ni wrote: > > Build error on s390: > > arch/s390/kernel/entry.o: in function `sys_call_table_emu': > > >> (.rodata+0x1288): undefined reference to `__s390_' > > > > In commit ("All arch: remove system call sys_sysctl") > > 148 common fdatasync sys_fdatasync sys_fdatasync > > -149 common _sysctl sys_sysctl compat_sys_sysctl > > +149 common _sysctl sys_ni_syscall > > 150 common mlock sys_mlock sys_mlock > > > > After the patch is integrated, there is a format error in the generated > > arch/s390/include/generated/asm/syscall_table.h: > > SYSCALL(sys_fdatasync, sys_fdatasync) > > SYSCALL(sys_ni_syscall,) /* cause build error */ > > SYSCALL(sys_mlock,sys_mlock) > > > > There are holes in the system call number in > > arch/s390/kernel/syscalls/syscall.tbl. When generating syscall_table.h, > > these hole numbers will be automatically filled with "NI_SYSCALL". > > Therefore, delete the number 149 to fix the current compilation failure. > > Similarly, modify tools/perf/arch/s390/entry/syscalls/syscall.tbl. > > > > Fixes: ("All arch: remove system call sys_sysctl") > > Fixes: https://lore.kernel.org/linuxppc-dev/20200616030734.87257-1-nixiaoming@huawei.com/ > > Reported-by: kernel test robot > > Signed-off-by: Xiaoming Ni > > --- > > arch/s390/kernel/syscalls/syscall.tbl | 1 - > > tools/perf/arch/s390/entry/syscalls/syscall.tbl | 1 - > > 2 files changed, 2 deletions(-) > > > > diff --git a/arch/s390/kernel/syscalls/syscall.tbl b/arch/s390/kernel/syscalls/syscall.tbl > > index f17aaf6fe5de..bcaf93994e3c 100644 > > --- a/arch/s390/kernel/syscalls/syscall.tbl > > +++ b/arch/s390/kernel/syscalls/syscall.tbl > > @@ -138,7 +138,6 @@ > > 146 common writev sys_writev compat_sys_writev > > 147 common getsid sys_getsid sys_getsid > > 148 common fdatasync sys_fdatasync sys_fdatasync > > -149 common _sysctl sys_ni_syscall > > This is not correct. It should be changed to: > > 149 common _sysctl - - > > Otherwise the generated __NR__sysctl define will be lost from > unistd.h, which should not happen. Looking at the link above it > _looks_ like a similar mistake was done for arm64. I think we're ok on arm64, since it's only the compat syscall table that is being updated and we don't export compat uapi headers (rather, they come from arch/arm/). Will