From patchwork Mon Apr 10 20:46:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 67594 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1B76F38708B0 for ; Mon, 10 Apr 2023 20:50:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1B76F38708B0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1681159822; bh=n+scPVh0AMfi+z8F+ULlnmVmFD1YNzH6BNcSZIF/OPg=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=uf235DRi8zwvy6IKU5vEebiR8806+jpnlxSc+Bu2LKfTxQDwqInkqMDvPjnG2JWND 22pW4OIfRIufqcYrWVDjXu3MmeCWNmwiNiqYFZIcxiE+lxwsSB8v1z192mprCWi5Rj PeMHuf7Tr0GcE64oUZyWeyKqUYEcodU/wiwQFeR0= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oi1-x22f.google.com (mail-oi1-x22f.google.com [IPv6:2607:f8b0:4864:20::22f]) by sourceware.org (Postfix) with ESMTPS id 6B4863856DD0 for ; Mon, 10 Apr 2023 20:46:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6B4863856DD0 Received: by mail-oi1-x22f.google.com with SMTP id e9so3997013oig.7 for ; Mon, 10 Apr 2023 13:46:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681159601; x=1683751601; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=n+scPVh0AMfi+z8F+ULlnmVmFD1YNzH6BNcSZIF/OPg=; b=LKfX3HUh23a/inVwabRUiUYsKpnlL+CK39c6VORU97FKar9+eldcWMGcYA75bIuUCG ajEAD4G0sd1zXuQzcPJnb6gbApcIgqhnrj4cNhJb9Ou0ZILc5/u7X12AJQCb3NNuAdst CsjX3XyoinZKD6+BZ59qCKLcRDOkMATuY+T9nMGbVWOuOZRFLQ+At98bRk1WVD1Q5LGH CsZaMcH6jlItr4n4fGn747XGhATKbWatAUBZerH+OXjpK7wdUq3W1zusd/GweVrIs7LH 2idIRsGJ3CfftfEGWD/c7A/DfbYm1NeLrVrEHMIfyq1XyJEibEz4FMU7/jZQvFmi1lEa d8qQ== X-Gm-Message-State: AAQBX9cHJ3YAyYAo+1ZVrXkANrwxAgdTCGwn63N5/zlFAshMRsZUz27S UIrefhWVt3kBjIU5ANK054j1b2guBV8t8p/tIf6KEA== X-Google-Smtp-Source: AKy350ZtlRPD23rKJjH/jtBD26XG+qlGij/z6MfmpzJhpcBtn+QlTTWGyAVxpjNs/BH60X5YSq2aHQ== X-Received: by 2002:a05:6808:2a83:b0:389:f9b:2171 with SMTP id fc3-20020a0568082a8300b003890f9b2171mr149927oib.35.1681159601089; Mon, 10 Apr 2023 13:46:41 -0700 (PDT) Received: from mandiga.. ([2804:1b3:a7c2:55a1:d59a:609a:284:6ed]) by smtp.gmail.com with ESMTPSA id p5-20020acabf05000000b003896f132821sm4865732oif.41.2023.04.10.13.46.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Apr 2023 13:46:40 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH v5 21/22] or1k: Fix Race conditions in pthread cancellation [BZ#12683] Date: Mon, 10 Apr 2023 17:46:13 -0300 Message-Id: <20230410204614.4129551-13-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230410204614.4129551-1-adhemerval.zanella@linaro.org> References: <20230410195907.4123869-1-adhemerval.zanella@linaro.org> <20230410204614.4129551-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SCC_5_SHORT_WORD_LINES, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" By adding the required syscall_cancel.S. Checked against a build and make check run-built-tests=no for or1k-linux-gnu-soft. --- sysdeps/unix/sysv/linux/or1k/syscall_cancel.S | 63 +++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 sysdeps/unix/sysv/linux/or1k/syscall_cancel.S diff --git a/sysdeps/unix/sysv/linux/or1k/syscall_cancel.S b/sysdeps/unix/sysv/linux/or1k/syscall_cancel.S new file mode 100644 index 0000000000..284029b244 --- /dev/null +++ b/sysdeps/unix/sysv/linux/or1k/syscall_cancel.S @@ -0,0 +1,63 @@ +/* Cancellable syscall wrapper. Linux/or1k version. + Copyright (C) 2023 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 +#include + +ENTRY (__syscall_cancel_arch) + l.addi r1, r1, -4 + cfi_def_cfa_offset (4) + l.sw 0(r1), r9 + cfi_offset (9, -4) + + .global __syscall_cancel_arch_start +__syscall_cancel_arch_start: + + /* if (*cancelhandling & CANCELED_BITMASK) + __syscall_do_cancel() */ + l.movhi r19, hi(0) + l.lwz r17, 0(r3) + l.andi r17, r17, 8 + l.sfeq r17, r19 + l.bnf 1f + + /* Issue a 6 argument syscall. */ + l.or r11, r4, r4 + l.or r3, r5, r5 + l.or r4, r6, r6 + l.or r5, r7, r7 + l.or r6, r8, r8 + l.lwz r7, 4(r1) + l.lwz r8, 8(r1) + l.sys 1 + l.nop + + .global __syscall_cancel_arch_end +__syscall_cancel_arch_end: + + l.lwz r9, 0(r1) + l.jr r9 + l.addi r1, r1, 4 + cfi_remember_state + cfi_def_cfa_offset (0) + cfi_restore (9) +1: + cfi_restore_state + l.jal __syscall_do_cancel + l.nop +END (__syscall_cancel_arch)