From patchwork Thu May 18 14:55:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Paul E. McKenney" X-Patchwork-Id: 95931 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp559853vqo; Thu, 18 May 2023 08:04:31 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4txVcV5DKY43aJ/JfV3qZy1jegrznZngWNxvase441bf69Pt28A5zMIdVlBKki7MvTk70+ X-Received: by 2002:a05:6a20:a10c:b0:104:98ea:48d5 with SMTP id q12-20020a056a20a10c00b0010498ea48d5mr2974520pzk.36.1684422271243; Thu, 18 May 2023 08:04:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684422271; cv=none; d=google.com; s=arc-20160816; b=o6MmAbwwTh/EFlfVmZDZ+QbVyy2ude6isN7h432EUGy/ep5UzKhviXMExlNZTUirKz +MZ6d4eO24yjIOWosRaKF/KHoKg9Nbz2XEqdPRpJsp0yyTSHwshPGvFYU+md/KY4L8l4 kwtGLR1EaCm84msXO940Y++F0a3lV8/IXE9ra0zMfciQmO/6MbooWqVFsGDQWmiQljif V7y8xIY2xESZzfvImAbWTkJ3bXi9VrmmNjBq0Cf/6zIlETm1wmfXiJ2NzaaS3h4P1iP4 G/lAchAyXkMmRN1EfluB//0kO48oGdXIGnRkDsFrsVr1NmTDdnjZHfS4GAAvmadVvuo0 r/jw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=UnRj4vWba3of/uBczgcxZ/yV4uPC4g/tNJ89oZJL1BA=; b=OjovskPf22IQ19mk6yn+ioM5VE2Ex1lI70KTi1wRlNMLztOmGPd3+q5cyiHJ9hIsYW z7Grsc45U2I+vzNiuEw/wPmW5GlqVmTepSzb3NRL4JcyoUM2CZQ4G3mgkZasryyhxrch g1dSEtqR3oEI6WR1dSIBq8O58r4rznLLcw8iOUs8RUmY6WfSSEWkIBmEGGi1Ub3zazxz O4FHYmRQuOxquZi1QmtUDcfct6IiHp7YOwCmI+jnT8RlVWnVP4OhS0cUj9rIDx7ALsiv EyZ+tr+cz2ZazH7fsUkVIkOKJ9GjF6FBHbW1Ozc+OVkkD71FBos+ybPPMaZn1Rh144tf Pp4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=L7Pi7tFT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i4-20020a63e444000000b005340955881asi1546612pgk.700.2023.05.18.08.04.10; Thu, 18 May 2023 08:04:31 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=L7Pi7tFT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231808AbjERO4E (ORCPT + 99 others); Thu, 18 May 2023 10:56:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36064 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231782AbjEROzf (ORCPT ); Thu, 18 May 2023 10:55:35 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 46B3C1B8 for ; Thu, 18 May 2023 07:55:30 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 866AC64FEC for ; Thu, 18 May 2023 14:55:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E6BCFC433A0; Thu, 18 May 2023 14:55:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684421728; bh=oC2jzfNDP3qXofDBVXlAqaNEq75nX/bGi7jR4v97zaE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=L7Pi7tFTWuHRkeYMhXRudDqd7gY+kSB1xD3N/MMZQimDb0N2rzg5mIP2ql8OEw5mI /p/KeubrVNcAIk8HX9CnizMDUF6ChJ1eQ/6atxkLiltAFwlItKUy0jtw95EUk1QCTs 0RRVOiXNDxE3VaAvPQueOwiK/A1mAzaspIFoBBEzb6YG1A2SAxF02f8J6liTDUplmj mDUvlEDoNMr61FlD/xnyA2PdRXGGS18XRF6dh0L6gg9reeErMVFUEe91vbBL3O5X8Z i9anV7/rRBnR5bXE0KawkUbsERJfESb2fTy3p18VcYoaGOip7KWo8Sdr3+32dsYh3Y Gr7Ob5NemnCuA== Received: by paulmck-ThinkPad-P17-Gen-1.home (Postfix, from userid 1000) id 30B94CE1BF0; Thu, 18 May 2023 07:55:23 -0700 (PDT) From: "Paul E. McKenney" To: linux-kernel@vger.kernel.org Cc: gwml@vger.gnuweeb.org, kernel-team@meta.com, w@lwt.eu, =?utf-8?q?Thomas_?= =?utf-8?q?Wei=C3=9Fschuh?= , Sven Schnelle , Willy Tarreau , "Paul E . McKenney" Subject: [PATCH v2 nolibc 13/15] tools/nolibc: s390: provide custom implementation for sys_fork Date: Thu, 18 May 2023 07:55:19 -0700 Message-Id: <20230518145521.3806117-13-paulmck@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <4817a4dc-69e6-4937-84d5-f2f630ff646c@paulmck-laptop> References: <4817a4dc-69e6-4937-84d5-f2f630ff646c@paulmck-laptop> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766244767616463374?= X-GMAIL-MSGID: =?utf-8?q?1766244767616463374?= From: Thomas Weißschuh On s390 the first two arguments to the clone() syscall are swapped, as documented in clone(2). Signed-off-by: Thomas Weißschuh Cc: Sven Schnelle Signed-off-by: Willy Tarreau Signed-off-by: Paul E. McKenney --- tools/include/nolibc/arch-s390.h | 9 +++++++++ tools/include/nolibc/sys.h | 2 ++ 2 files changed, 11 insertions(+) diff --git a/tools/include/nolibc/arch-s390.h b/tools/include/nolibc/arch-s390.h index c62ee2472407..a738e7f3f8e8 100644 --- a/tools/include/nolibc/arch-s390.h +++ b/tools/include/nolibc/arch-s390.h @@ -5,6 +5,7 @@ #ifndef _NOLIBC_ARCH_S390_H #define _NOLIBC_ARCH_S390_H +#include #include /* The struct returned by the stat() syscall, equivalent to stat64(). The @@ -223,4 +224,12 @@ void *sys_mmap(void *addr, size_t length, int prot, int flags, int fd, return (void *)my_syscall1(__NR_mmap, &args); } #define sys_mmap sys_mmap + +static __attribute__((unused)) +pid_t sys_fork(void) +{ + return my_syscall5(__NR_clone, 0, SIGCHLD, 0, 0, 0); +} +#define sys_fork sys_fork + #endif /* _NOLIBC_ARCH_S390_H */ diff --git a/tools/include/nolibc/sys.h b/tools/include/nolibc/sys.h index 1b9b91cd8b57..60dffb1cbf96 100644 --- a/tools/include/nolibc/sys.h +++ b/tools/include/nolibc/sys.h @@ -336,6 +336,7 @@ void exit(int status) * pid_t fork(void); */ +#ifndef sys_fork static __attribute__((unused)) pid_t sys_fork(void) { @@ -351,6 +352,7 @@ pid_t sys_fork(void) #error Neither __NR_clone nor __NR_fork defined, cannot implement sys_fork() #endif } +#endif static __attribute__((unused)) pid_t fork(void)