From patchwork Tue Mar 26 09:19:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Jelinek X-Patchwork-Id: 87655 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 5A6913858417 for ; Tue, 26 Mar 2024 09:19:59 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id DDA95385841D for ; Tue, 26 Mar 2024 09:19:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DDA95385841D Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org DDA95385841D Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711444767; cv=none; b=EPPbryUrhBTlL/wzp8eyshFOfbCoeuNXsL3QP9NS3FwEvuANQx1lNQc9Hm91mmoIVP3tatkEzqAOcEyXYeeQ6IVOpsDM5laf/NAc/lJpHZXBchhAAwP4xyIqTl0DubGukuzJ0XDsIiER1j2WYuMuZ/NLH27msMdVkhMLZNqHQUM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711444767; c=relaxed/simple; bh=j0/B5tBAMI8+2P3eKWE8lbb7AbRd0fQABcDxGMGJgyg=; h=DKIM-Signature:Date:From:To:Subject:Message-ID:MIME-Version; b=vyeziMUyKKOoJOXwUhAO133tdPoRzjrR9YVmn41tgUxImIWsZHMl7jzfyAVTd7UEucqmD65PtID+9lt84QhkXCdVwnwmeI57CvTHWqU0xK+XLTK9beT9rDRPqr3GMYL8oEtuIE/5SAm7KulFkYv85XYdLYrxH7uQ+7KhFE0gMKo= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1711444759; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type; bh=jG2J2unQY4Z6GMiThvd1lUbk6z6f9fXAF/icyQN2RvY=; b=Vj282qRCzKq9MJYtfuaXty8MpgRJRIhJ1ZgzMbfyqug3mWWtC8FdZuO3wxaBKMw3QTnESn sHMgAQLOBP1vUFEQ1g16eSpwe6XS9EBFfcBMC/8e9lfEdiOb0SBqYpNnWtbsp9L2hPzGuq v9Tj6JeTM1jMKTPWHfksSfs+MXL/MDo= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-65-Uw9n9dQCNUKzr4QWXL6ATA-1; Tue, 26 Mar 2024 05:19:15 -0400 X-MC-Unique: Uw9n9dQCNUKzr4QWXL6ATA-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 99D3E3C0D192; Tue, 26 Mar 2024 09:19:15 +0000 (UTC) Received: from tucnak.zalov.cz (unknown [10.39.192.57]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5DE06C1576F; Tue, 26 Mar 2024 09:19:15 +0000 (UTC) Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.17.1/8.17.1) with ESMTPS id 42Q9J8OW2910445 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 26 Mar 2024 10:19:09 +0100 Received: (from jakub@localhost) by tucnak.zalov.cz (8.17.1/8.17.1/Submit) id 42Q9J8La2910444; Tue, 26 Mar 2024 10:19:08 +0100 Date: Tue, 26 Mar 2024 10:19:07 +0100 From: Jakub Jelinek To: Richard Biener Cc: gcc-patches@gcc.gnu.org Subject: [PATCH] tsan: Don't instrument non-generic AS accesses [PR111736] Message-ID: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, 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: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Jakub Jelinek Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Hi! Similar to the asan and ubsan changes, we shouldn't instrument non-generic address space accesses with tsan, because we just have library functions which take address of the objects as generic address space pointers, so they can't handle anything else. Bootstrapped/regtested on x86_64-linux and i686-linux, ok for trunk? 2024-03-26 Jakub Jelinek PR sanitizer/111736 * tsan.cc (instrument_expr): Punt on non-generic address space accesses. * gcc.dg/tsan/pr111736.c: New test. Jakub --- gcc/tsan.cc.jj 2024-01-03 11:51:29.155764166 +0100 +++ gcc/tsan.cc 2024-03-25 10:36:07.602861266 +0100 @@ -139,6 +139,9 @@ instrument_expr (gimple_stmt_iterator gs if (TREE_READONLY (base) || (VAR_P (base) && DECL_HARD_REGISTER (base))) return false; + if (!ADDR_SPACE_GENERIC_P (TYPE_ADDR_SPACE (TREE_TYPE (base)))) + return false; + stmt = gsi_stmt (gsi); loc = gimple_location (stmt); rhs = is_vptr_store (stmt, expr, is_write); --- gcc/testsuite/gcc.dg/tsan/pr111736.c.jj 2024-03-25 10:38:07.663191030 +0100 +++ gcc/testsuite/gcc.dg/tsan/pr111736.c 2024-03-25 10:43:08.071008937 +0100 @@ -0,0 +1,17 @@ +/* PR sanitizer/111736 */ +/* { dg-do compile { target i?86-*-* x86_64-*-* } } */ +/* { dg-options "-fsanitize=thread -fdump-tree-optimized -ffat-lto-objects" } */ +/* { dg-final { scan-tree-dump-not "__tsan_read" "optimized" } } */ +/* { dg-final { scan-tree-dump-not "__tsan_write" "optimized" } } */ + +#ifdef __x86_64__ +#define SEG __seg_fs +#else +#define SEG __seg_gs +#endif + +void +foo (int SEG *p, int SEG *q) +{ + *q = *p; +}