From patchwork Wed Jun 9 14:02:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 1489893 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4G0TMg3Qncz9sSs; Thu, 10 Jun 2021 00:02:55 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1lqynD-0006WO-4Y; Wed, 09 Jun 2021 14:02:51 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lqynB-0006WI-8q for kernel-team@lists.ubuntu.com; Wed, 09 Jun 2021 14:02:49 +0000 Received: from mail-wm1-f69.google.com ([209.85.128.69]) by youngberry.canonical.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lqynB-0002FK-1C for kernel-team@lists.ubuntu.com; Wed, 09 Jun 2021 14:02:49 +0000 Received: by mail-wm1-f69.google.com with SMTP id n2-20020a05600c3b82b02901aeb7a4ac06so2585917wms.5 for ; Wed, 09 Jun 2021 07:02:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Qyx1TxzwRFLKP+DDkR/mCQzHJdezWq4n3383k6oIijg=; b=CtwbUxTv2YihaQiab5sGmrQS8UfOEazgIqmYuHum5oirEgWYzrqHfdjXPIv3JBAPzm XQG/yDXHX6755Id1moyau1kYkuHfC2RbtdaEgOWpC2QlLKbfboCm+wqPIhMXfA1iYGRl e27/5MnV+Gy98pjRMIOuPtS8t0T/mUuFQKhoUQ4Bb9/bky386L5SoInkltydZX4Vy3m4 r5FOQbUUBezO29VIoZ4WprK+C+mEIlKbEz3OOTkXWpZFUIPUaHjNS8cahHl8xAwfdy9U 1rxJVqQScobirF37qUJsCJWgISkjQY0sw6fswBbAyglkzyT0lkCCHi2V6uIcVUkt+iwN TLIg== X-Gm-Message-State: AOAM533hITq9Cel9TSksrNcvgCAtSvZl/msXLuOgShTgStzKXi+qTvEb XtZY3SkTmzZ9ctm+cDDsj1BaNYdEZzIl3rZWi0WmgtSK9rgufbhPVB5MPqxJA3U7nrIz0G23EWU bPyoEwI4Ag0YtLfbcuKtBcx4y3+QjLQbJwFsQeuEURw== X-Received: by 2002:a7b:cf2e:: with SMTP id m14mr26827132wmg.111.1623247368523; Wed, 09 Jun 2021 07:02:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx1VFrNtlP5CQvAjXpFy636bMXq5HgTRe+iq+qfGzTH6dfIafqeeWkuJWXeMnG+ixWjDoGQMA== X-Received: by 2002:a7b:cf2e:: with SMTP id m14mr26827115wmg.111.1623247368394; Wed, 09 Jun 2021 07:02:48 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-177-222.adslplus.ch. [188.155.177.222]) by smtp.gmail.com with ESMTPSA id u14sm6255122wmc.41.2021.06.09.07.02.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Jun 2021 07:02:47 -0700 (PDT) From: Krzysztof Kozlowski To: kernel-team@lists.ubuntu.com Subject: [ACT][PATCH v2] UBUNTU: SAUCE: ubuntu_ltp_syscalls: skip semctl09 on older Glibc Date: Wed, 9 Jun 2021 16:02:40 +0200 Message-Id: <20210609140240.85342-1-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" The semctl09 fails: tst_test.c:1261: TINFO: Timeout per run is 0h 05m 00s semctl09.c:70: TINFO: Test libc semctl() semctl09.c:132: TINFO: Test SEM_STAT_ANY with nobody user semctl09.c:148: TFAIL: SEM_STAT_ANY doesn't pass the buffer specified by the caller to kernel semctl09.c:132: TINFO: Test SEM_STAT_ANY with root user semctl09.c:148: TFAIL: SEM_STAT_ANY doesn't pass the buffer specified by the caller to kernel The test depends on Glibc commit 574500a108be ("sysvipc: Fix SEM_STAT_ANY kernel argument pass [BZ #26637]") which is fixed in Glibc v2.33. Blacklist it if current libc is older. BugLink: https://bugs.launchpad.net/bugs/1910312 Signed-off-by: Krzysztof Kozlowski Acked-by: Po-Hsu Lin --- Changes since v1: 1. v2.34 -> 2.33, following Sam's advice. --- ubuntu_ltp_syscalls/testcase_blacklist.py | 11 ++++++++++- ubuntu_ltp_syscalls/ubuntu_ltp_syscalls.py | 11 +++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/ubuntu_ltp_syscalls/testcase_blacklist.py b/ubuntu_ltp_syscalls/testcase_blacklist.py index 3718a7d6485a..d9face73746a 100644 --- a/ubuntu_ltp_syscalls/testcase_blacklist.py +++ b/ubuntu_ltp_syscalls/testcase_blacklist.py @@ -35,5 +35,14 @@ blacklist_db = { 'copy_file_range02 copy_file_range02': { 'comment': 'copy_file_range02 will not get fixed < 5.2.0 (https://lwn.net/Articles/774114)'} } - } + }, + 'libc': { + # Coming with commit 574500a108be ("sysvipc: Fix SEM_STAT_ANY kernel argument pass [BZ #26637]") + # in glibc v2.33 + '2.33': { + 'semctl09 semctl09': { + 'comment': 'semctl09 will not get fixed for glibc < 2.33 (lp: 1910312)', + }, + }, + }, } diff --git a/ubuntu_ltp_syscalls/ubuntu_ltp_syscalls.py b/ubuntu_ltp_syscalls/ubuntu_ltp_syscalls.py index 8107fdefc485..b6b09246393b 100644 --- a/ubuntu_ltp_syscalls/ubuntu_ltp_syscalls.py +++ b/ubuntu_ltp_syscalls/ubuntu_ltp_syscalls.py @@ -72,6 +72,7 @@ class ubuntu_ltp_syscalls(test.test): self.series = distro.codename() self.flavour = re.split('-\d*-', platform.uname()[2])[-1] self.kernel = platform.uname()[2].split('-')[0] + self.libc = platform.libc_ver()[1] # setup # @@ -132,6 +133,16 @@ class ubuntu_ltp_syscalls(test.test): if StrictVersion(self.kernel) < StrictVersion(_kernel): _blacklist += list(blacklist_db['kernel'][_kernel].keys()) + try: + current_version = parse(self.libc) + for _libc in blacklist_db['libc']: + if current_version < parse(_libc): + _blacklist += list(blacklist_db['libc'][_libc].keys()) + except NameError: + for _libc in blacklist_db['libc']: + if StrictVersion(self.libc) < StrictVersion(_libc): + _blacklist += list(blacklist_db['libc'][_libc].keys()) + return _blacklist def should_stop_timesyncd(self, test):