From patchwork Wed Dec 14 17:29:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 61938 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 2E6833832E75 for ; Wed, 14 Dec 2022 17:29:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2E6833832E75 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1671038982; bh=BpS1VSzfWl2UZRY0GWAtkzmgJGzQYK39tHZM23C6f8I=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=y37tBmmlrcMY4l8MrGf96icppMBUGlC7GZtHKzAbTea9xF6fwnZkD6FkZnGeZv8sZ 9bo92XXViARXYC2mO2Q2NbmDOmqKB6RYaM/JgEBgkKk2+pz45sAXhclJaAUbQWD8z8 NZQYps9SHNIcLu4FsRtYPoLhG1BrjT6QBbgx/ph0= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pf1-x42f.google.com (mail-pf1-x42f.google.com [IPv6:2607:f8b0:4864:20::42f]) by sourceware.org (Postfix) with ESMTPS id E8D1B382EF18 for ; Wed, 14 Dec 2022 17:29:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org E8D1B382EF18 Received: by mail-pf1-x42f.google.com with SMTP id n3so4934411pfq.10 for ; Wed, 14 Dec 2022 09:29:11 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=BpS1VSzfWl2UZRY0GWAtkzmgJGzQYK39tHZM23C6f8I=; b=zJutF5ANukRu9ZueLWSXrGhm750ExVyOJinI0JBcswOKhNaTj+he0MsnlpRmUTwi8r oM22sCt9KS8jy8wpMMe3qVziCtTQQ+7sgsS1C1AuPNhQvQByREnJz7xiinU5a2nk/dKY sipM2r58mPvVVktVWWWHeJpqKD04XKnD+bwgdqsMn1gSnjvXYmhXvOwM4CJw+ouBAAT9 bMHeEfdRK5iOIsMGDljknTC+iOCqgxVIEgWAPVjIAN4dgm1Mh30YjwyTExTg96HwVp6D h9h/3/3bvEdULBZefiqHOaX82uxMIEckD3bI19sygGppjAEPJ4uWco3CH/XIOOoWJa5r gqrw== X-Gm-Message-State: ANoB5pmd+tU/XrdRr+r4ad8BYixQ2BjvULOSFGv7IZU5/a50o1J9VCQN WkuoWWRm5A/irXGuV6TSb6M= X-Google-Smtp-Source: AA0mqf48OmUGamPUXqgUB0PXRBLbC0IE1J8ksuUbvWhfBHzFoKvx9WS5qzWdjFuafXOjXmZWHpMyTg== X-Received: by 2002:aa7:96fc:0:b0:577:fdb8:e601 with SMTP id i28-20020aa796fc000000b00577fdb8e601mr22916493pfq.21.1671038950763; Wed, 14 Dec 2022 09:29:10 -0800 (PST) Received: from gnu-cfl-3.localdomain ([172.56.30.207]) by smtp.gmail.com with ESMTPSA id k74-20020a62844d000000b0056d2317455bsm163203pfd.7.2022.12.14.09.29.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Dec 2022 09:29:10 -0800 (PST) Received: from gnu-cfl-3.. (localhost [IPv6:::1]) by gnu-cfl-3.localdomain (Postfix) with ESMTP id E9584740079; Wed, 14 Dec 2022 09:29:08 -0800 (PST) To: libc-alpha@sourceware.org Cc: Noah Goldstein Subject: [PATCH] x86: Add a testcase for BZ #29863 Date: Wed, 14 Dec 2022 09:29:08 -0800 Message-Id: <20221214172908.2433968-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 X-Spam-Status: No, score=-3023.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, KAM_NUMSUBJECT, KAM_SHORT, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, 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: "H.J. Lu via Libc-alpha" From: "H.J. Lu" Reply-To: "H.J. Lu" Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" When a thread is updating the memory area of memcmp and another thread is doing memcmp, the memcmp return value is undefined. Add a testcase to verify that memcmp won't segfault in this case. --- sysdeps/x86/Makefile | 11 +++++ sysdeps/x86/tst-memcmp-race-sse2.c | 1 + sysdeps/x86/tst-memcmp-race.c | 75 ++++++++++++++++++++++++++++++ 3 files changed, 87 insertions(+) create mode 100644 sysdeps/x86/tst-memcmp-race-sse2.c create mode 100644 sysdeps/x86/tst-memcmp-race.c diff --git a/sysdeps/x86/Makefile b/sysdeps/x86/Makefile index 56fd5fc805..3e07e18c7d 100644 --- a/sysdeps/x86/Makefile +++ b/sysdeps/x86/Makefile @@ -257,3 +257,14 @@ tests += \ tests-static += \ tst-sysconf-cache-linesize-static endif + +ifeq ($(subdir),nptl) +tests += \ + tst-memcmp-race-sse2 \ + tst-memcmp-race \ +# tests + +CFLAGS-tst-memcmp-race-sse2.c += -O0 +CFLAGS-tst-memcmp-race.c += -O0 +tst-memcmp-race-sse2-ENV = GLIBC_TUNABLES=glibc.cpu.hwcaps=-AVX2 +endif diff --git a/sysdeps/x86/tst-memcmp-race-sse2.c b/sysdeps/x86/tst-memcmp-race-sse2.c new file mode 100644 index 0000000000..2986e418f3 --- /dev/null +++ b/sysdeps/x86/tst-memcmp-race-sse2.c @@ -0,0 +1 @@ +#include "tst-memcmp-race.c" diff --git a/sysdeps/x86/tst-memcmp-race.c b/sysdeps/x86/tst-memcmp-race.c new file mode 100644 index 0000000000..f8f8e47f6e --- /dev/null +++ b/sysdeps/x86/tst-memcmp-race.c @@ -0,0 +1,75 @@ +/* Test case for memcmp with race condition. + Copyright (C) 2022 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 +#include +#include + +#define NUM_THREADS 2 +#define LEN 17 +#define STR "abcdefghijklmnopq" +#define LOOP1 100 +#define LOOP2 1000000 + +char buf1[LEN], buf2[LEN]; + +static void * +childThread (void *tArgs) +{ + int i; + + if (0 == (size_t)tArgs % 2) + { + for (i = 0; i < LOOP1; i++) + { + int result; + + result = memcmp (buf1, buf2, LEN); + printf ("i = %d : result = %d\n", i, result); + } + } + else + { + for (i = 0; i < LOOP2; i++) + buf1[1] = (0 == (i % 2)) ? 'b' : 'c'; + } + + return NULL; +} + +static int +do_test (void) +{ + int i; + pthread_t threads[NUM_THREADS]; + + memcpy (buf1, STR, LEN); + memcpy (buf2, STR, LEN); + + for (i = 0; i < NUM_THREADS; ++i) + threads[i] = xpthread_create (NULL, childThread, + (void *)(uintptr_t) i); + + for (i = 0; i < NUM_THREADS; ++i) + xpthread_join (threads[i]); + + return 0; +} + +#include