From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qk1-x741.google.com (mail-qk1-x741.google.com [IPv6:2607:f8b0:4864:20::741]) by sourceware.org (Postfix) with ESMTPS id 86586385DC23 for ; Wed, 15 Apr 2020 14:51:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 86586385DC23 Received: by mail-qk1-x741.google.com with SMTP id o19so10156795qkk.5 for ; Wed, 15 Apr 2020 07:51:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:autocrypt :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=L+vfGNo7Q0RQWUAbkqrPCRk3hA9JU8fAJNmc+pwIl78=; b=YdOzTtxMLrpRAZSAeRO3F1X0BfoDcIyi3G5pYCG+2G3yAt6Mbqoi+kXEVo4FF7If9l t7uqzerNiz+w69nCWCWaksdUzb5RdFY9jTF+bdkY4+SIeEvl3WK9pRhdIjgMwI2F0qhq QQtmCRj4N8aqJ79PlbkP1mnX8AjibkwwIcC6hktUb0MNxo+8ok7oUQGcJYaZv1AOqFBj MlHJaW0iZhSAZMupgS9qD2IIolfWsbfs17qbMtim9pvm+7ckadPXYXijGbVhZQENzcGh iLIlgOi3NjUifG1VHQuD89nSob/bjhdASf8dKLU4X3+hsAxiTB81p6Ll1gM6KqTK9tlq QXvQ== X-Gm-Message-State: AGi0PuYuu4Es39BGU6EHgOxbCegH7d9KOgOIrrjasLPFghdnYQg0Pa14 8H8qyMjUvrKBrUyAdJrEfdcYT0siHblwRQ== X-Google-Smtp-Source: APiQypKV4eNTKiaSsOGiHpRcH9FZUGB9tYuVRFA2sHplRvVkWph7H4cRsbX21Jn3pPpRM9x0ejP31Q== X-Received: by 2002:a05:620a:1458:: with SMTP id i24mr6411622qkl.279.1586962305782; Wed, 15 Apr 2020 07:51:45 -0700 (PDT) Received: from [192.168.1.4] ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id p9sm12356615qkg.34.2020.04.15.07.51.44 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 15 Apr 2020 07:51:45 -0700 (PDT) Subject: Re: [PATCH v4 14/21] nptl: m68k: Fix Race conditions in pthread cancellation [BZ#12683] To: Stepan Golosunov Cc: libc-alpha@sourceware.org References: <20200403203201.7494-1-adhemerval.zanella@linaro.org> <20200403203201.7494-15-adhemerval.zanella@linaro.org> <20200412154230.i5f7bajoqrpcrn36@sghpc.golosunov.pp.ru> From: Adhemerval Zanella Autocrypt: addr=adhemerval.zanella@linaro.org; prefer-encrypt=mutual; keydata= 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 Message-ID: <4d2519b1-02ae-5265-9a12-0d9a186f6e2b@linaro.org> Date: Wed, 15 Apr 2020 11:51:42 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: <20200412154230.i5f7bajoqrpcrn36@sghpc.golosunov.pp.ru> Content-Type: text/plain; charset=koi8-r Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-15.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, MIME_CHARSET_FARAWAY, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Apr 2020 14:51:47 -0000 On 12/04/2020 12:42, Stepan Golosunov wrote: > 03.04.2020 Χ 17:31:54 -0300 Adhemerval Zanella ΞΑΠΙΣΑΜ: >> This patch adds the m68k modifications required for the BZ#12683 fix >> by adding the arch-specific cancellation syscall bridge. >> >> Checked on m68k-linux-gnu. >> --- >> sysdeps/m68k/nptl/tcb-offsets.sym | 3 + >> sysdeps/unix/sysv/linux/m68k/syscall_cancel.S | 85 +++++++++++++++++++ >> 2 files changed, 88 insertions(+) >> create mode 100644 sysdeps/unix/sysv/linux/m68k/syscall_cancel.S > >> --- /dev/null >> +++ b/sysdeps/unix/sysv/linux/m68k/syscall_cancel.S >> @@ -0,0 +1,85 @@ >> +/* Cancellable syscall wrapper. Linux/m68k version. >> + Copyright (C) 2020 Free Software Foundation, Inc. >> + This file is part of the GNU C Library. >> + >> + The GNU C Library is free software; you can redistribute it and/or >> + modify it under the terms of the GNU Lesser General Public >> + License as published by the Free Software Foundation; either >> + version 2.1 of the License, or (at your option) any later version. >> + >> + The GNU C Library is distributed in the hope that it will be useful, >> + but WITHOUT ANY WARRANTY; without even the implied warranty of >> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >> + Lesser General Public License for more details. >> + >> + You should have received a copy of the GNU Lesser General Public >> + License along with the GNU C Library; if not, see >> + . */ >> + >> +#include >> + >> +/* long int __syscall_cancel_arch (int *cancelhandling, >> + __syscall_arg_t nr, >> + __syscall_arg_t arg1, >> + __syscall_arg_t arg2, >> + __syscall_arg_t arg3, >> + __syscall_arg_t arg4, >> + __syscall_arg_t arg5, >> + __syscall_arg_t arg6, >> + __syscall_arg_t arg7) */ > > Is #define for HAVE_CANCELABLE_SYSCALL_WITH_7_ARGS missing? > More likely the comment is wrong though. > Same issue in the alpha patch. No, on both cases the comment is wrong. I have fixed both. > >> + >> + >> +ENTRY (__syscall_cancel_arch) >> +#ifdef __mcoldfire__ >> + lea (-16,%sp),%sp >> + movem.l #60,(%sp) >> +#else >> + movem.l #15360,-(%sp) >> +#endif >> + cfi_def_cfa_offset (20) >> + cfi_offset (2, -20) >> + cfi_offset (3, -16) >> + cfi_offset (4, -12) >> + cfi_offset (5, -8) >> + >> + .global __syscall_cancel_arch_start >> +__syscall_cancel_arch_start: >> + >> + move.l 20(%sp),%a0 >> + move.l (%a0),%d0 >> +#ifdef __mcoldfire__ >> + move.w %d0,%ccr >> + jeq 1f >> +#else >> + btst #TCB_CANCELED_BIT,%d0 >> + jne 1f >> +#endif >> + >> + move.l 48(%sp),%a0 >> + move.l 44(%sp),%d5 >> + move.l 40(%sp),%d4 >> + move.l 36(%sp),%d3 >> + move.l 32(%sp),%d2 >> + move.l 28(%sp),%d1 >> + move.l 24(%sp),%d0 >> + trap #0 >> + >> + .global __syscall_cancel_arch_end >> +__syscall_cancel_arch_end: >> + >> +#ifdef __mcoldfire__ >> + movem.l (%sp),#60 >> + lea (16,%sp),%sp >> +#else >> + movem.l (%sp)+,#60 >> +#endif >> + rts >> + >> +1: >> +#ifdef PIC >> + bsr.l __syscall_do_cancel >> +#else >> + jsr __syscall_do_cancel >> +#endif >> +END (__syscall_cancel_arch) >> +libc_hidden_def (__syscall_cancel_arch)