From patchwork Mon Dec 3 19:01:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hackmann X-Patchwork-Id: 1007169 X-Patchwork-Delegate: petr.vorel@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.linux.it (client-ip=213.254.12.146; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="F3jXOGPT"; dkim-atps=neutral Received: from picard.linux.it (picard.linux.it [213.254.12.146]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 437vW74976z9s8r for ; Tue, 4 Dec 2018 06:02:10 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id D788E3E715F for ; Mon, 3 Dec 2018 20:02:06 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-2.smtp.seeweb.it (in-2.smtp.seeweb.it [217.194.8.2]) by picard.linux.it (Postfix) with ESMTP id 673923E715F for ; Mon, 3 Dec 2018 20:02:05 +0100 (CET) Received: from mail-io1-xd49.google.com (mail-io1-xd49.google.com [IPv6:2607:f8b0:4864:20::d49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by in-2.smtp.seeweb.it (Postfix) with ESMTPS id 2BC9A6008F8 for ; Mon, 3 Dec 2018 20:01:57 +0100 (CET) Received: by mail-io1-xd49.google.com with SMTP id m5so15120276ioj.15 for ; Mon, 03 Dec 2018 11:01:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=DIXzHjwwGEKCFTjmiQtH3Dim9GgOjs92FAF5AlNQoAw=; b=F3jXOGPTS71dK2N2kxAucEhRvnBtVoR/NmnwwFU+jqtudlMwm9gdm2E52dQI7nNe/M SzUCeC+JkCNFO3jx8eaZH4qweTRQEzpvNUf/c+q/f2YGKrnBClkGBWOyr6lvxO/ZlDst V4aEwUzwZbpWhB86mYoVPhKoaTJDpw6Sa87D/jRwJ4tRF54Ikstt0wzUbrigVUAx1jMP 3XcMBnSjC/5aLivAzf5uG067NMcWD2eioEV4tzo5zzp7n7O4kgI9rREILywNkgZj+BF6 lwHN9DsD/yuiaE3xK6DKwE/Zkn3LIa0FoUvca0TVdPZNWiqTV6rM/wtjPiip4O7MILVF 6tfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=DIXzHjwwGEKCFTjmiQtH3Dim9GgOjs92FAF5AlNQoAw=; b=ttD5lzroyqBy6IiyMh/agfUUz39liCZxryC7JirwwaQvLQ21UmGLJRI968cEZgwUDE k80ndNCLbxi2iquxHCuFIEiv+ukHTLnH6v3JZwfwUhye1H1c3i0XCbA5uZkQ20GYMz06 i5eV+ZE29o5S3qMqWsx+UeKuoYp0DzGw9Wg0F/vJ6vCtbHa003lThFN0cTTXInjFqIvw nqB1KQwhk0qOVKjw1SIt9lQU833URS8rJxXEq672NMjPEVMhA5b7KPK87oldcNWWt2uw 4WxMLgPDMtFRpJXuj9UC9sG7R4sOxq58r8y8In3F5W+8mrAH3udOxxLlvlMVJR0Rsurx yoIQ== X-Gm-Message-State: AA+aEWaj2KFkklH0FgtmT6BcY+l855KURwNCWjQj6YwQ/1aNynDUF+dR qkbbmNTYB4x1nLc4jJjcrRRYTyp//vbfE6IX/htmFL3hI3iIPA9qapIwSapgvfHbDXNcHN5ahey aVt89qWM3x4Z1My8Q6gGTmOaWpRHy2rGT+WTWFYhVE93+kCgGxyuXlkPh1mQ0ICFI X-Google-Smtp-Source: AFSGD/Uj7/wBbvxWCZvGwsSROTvKcItQwILEEOzcITK3EIbxB4mUZ3tVbwmVomSdr9yUXolABXETjZYISdMmYbI= X-Received: by 2002:a24:760e:: with SMTP id z14mr7781551itb.5.1543863715427; Mon, 03 Dec 2018 11:01:55 -0800 (PST) Date: Mon, 3 Dec 2018 11:01:47 -0800 Message-Id: <20181203190148.93108-1-ghackmann@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.20.0.rc1.387.gf8505762e3-goog From: Greg Hackmann To: ltp@lists.linux.it X-Virus-Scanned: clamav-milter 0.99.2 at in-2.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=-7.4 required=7.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, SPF_PASS, USER_IN_DEF_DKIM_WL autolearn=disabled version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-2.smtp.seeweb.it Cc: kernel-team@android.com Subject: [LTP] [PATCH 1/2] getrlimit/getrlimit03: add configure-time check for struct ulimit64 X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.18 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" The kernel's UAPI headers export a definition of struct ulimit64 which can conflict with the open-coded one in getrlimit03. Fix this by moving getrlimit03's definition behind a configure-time check. Signed-off-by: Greg Hackmann Reviewed-by: Petr Vorel --- configure.ac | 1 + m4/ltp-rlimit64.m4 | 10 ++++++++++ testcases/kernel/syscalls/getrlimit/getrlimit03.c | 2 ++ 3 files changed, 13 insertions(+) create mode 100644 m4/ltp-rlimit64.m4 diff --git a/configure.ac b/configure.ac index e81d2add5..caea34462 100644 --- a/configure.ac +++ b/configure.ac @@ -228,6 +228,7 @@ LTP_CHECK_UNAME_DOMAINNAME LTP_CHECK_X_TABLES LTP_CHECK_ATOMIC_MEMORY_MODEL LTP_CHECK_TPACKET_V3 +LTP_CHECK_RLIMIT64 LTP_DETECT_HOST_CPU LTP_CHECK_PERF_EVENT diff --git a/m4/ltp-rlimit64.m4 b/m4/ltp-rlimit64.m4 new file mode 100644 index 000000000..f2e6c526a --- /dev/null +++ b/m4/ltp-rlimit64.m4 @@ -0,0 +1,10 @@ +dnl SPDX-License-Identifier: GPL-2.0-or-later +dnl Copyright (c) 2018 Google, Inc. + +AC_DEFUN([LTP_CHECK_RLIMIT64],[ +AC_CHECK_TYPES([struct rlimit64],,,[ +#include +#include +]) +]) + diff --git a/testcases/kernel/syscalls/getrlimit/getrlimit03.c b/testcases/kernel/syscalls/getrlimit/getrlimit03.c index 9ff28acb6..376ef7241 100644 --- a/testcases/kernel/syscalls/getrlimit/getrlimit03.c +++ b/testcases/kernel/syscalls/getrlimit/getrlimit03.c @@ -44,10 +44,12 @@ #define __NR_getrlimit_ulong_str "__NR_getrlimit" #endif +#ifndef HAVE_STRUCT_RLIMIT64 struct rlimit64 { uint64_t rlim_cur; uint64_t rlim_max; }; +#endif const uint64_t RLIM_INFINITY_U64 = UINT64_MAX; static int getrlimit_u64(int resource, struct rlimit64 *rlim) From patchwork Mon Dec 3 19:01:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hackmann X-Patchwork-Id: 1007170 X-Patchwork-Delegate: petr.vorel@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.linux.it (client-ip=2001:1418:10:5::2; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="YYyhUB7f"; dkim-atps=neutral Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 437vWB4Zy4z9s8r for ; Tue, 4 Dec 2018 06:02:14 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 041113E71D4 for ; Mon, 3 Dec 2018 20:02:12 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-6.smtp.seeweb.it (in-6.smtp.seeweb.it [217.194.8.6]) by picard.linux.it (Postfix) with ESMTP id 012E33E7213 for ; Mon, 3 Dec 2018 20:02:09 +0100 (CET) Received: from mail-it1-x14a.google.com (mail-it1-x14a.google.com [IPv6:2607:f8b0:4864:20::14a]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by in-6.smtp.seeweb.it (Postfix) with ESMTPS id 5E8D51400DCE for ; Mon, 3 Dec 2018 20:02:08 +0100 (CET) Received: by mail-it1-x14a.google.com with SMTP id j202so6669050itj.1 for ; Mon, 03 Dec 2018 11:02:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=baSz9G3lV6UR06ckxsodxeOFQB/x7kzAIMp7Ui3L98A=; b=YYyhUB7fbXodZPT9oQWiyygEALwbhAQtQrbmzmM00GDmRXJ9aPcb/cV+rkIS9UsruX 22BniIPKRZ+jXBuGTsXRqVzab6gQeDqjyLPeCDnXxgbbzb3vkAlKVkut2T26oefsnTkF kMdT+0aVGYYrRMJfgNss2RuKLLtEVNQr/dIkcw9CXdQAFObIXy0MGJjrh765CI0YauaW WpSxhkcdJcVPPca47Qjw7ak1kS6Uu5IDoTcMeXEu/Gig+Om3ieioO/jEGp8cm6Qufbel IKC82vIIowSS4C25T/JmodE4fDfIS0TUy+GEyVxnHBgbzvTEkb4z2mnHDxHuGYZQzATA cLvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=baSz9G3lV6UR06ckxsodxeOFQB/x7kzAIMp7Ui3L98A=; b=ext9m9NgQ9QP9arNiFBNfu3/KxuwCmvZCf1c1fTKnWSk+4qW6+nRqhIybfuaexDnDP CvgTWMoPIr/7N2GEaK+ajubL237YhBga0AeXOMWt9y3cVcBbK3sgDlsKV9s82Apjlbl4 grJ4oS+r3JLZTYAaTeECDEqh1McQZsNOYMPY4Yxs3g636f+TDmKn89Uye/RA9/ARIePe L9jFEh+Ih60XIbXqpkQVudaCmIeGxCF5q7+C85Q4N3FJKTHejHmujgzbOgraNHQFZ/QL yGfO86nr/eB7q1CTRqfh11jNrmdHmF+XkMU2RNG4g41QdoMlaLqAGjlqDRhqNy9t6sdn LN8A== X-Gm-Message-State: AA+aEWYGkB/CUyw6tV5H6eJmFlXg51Los97AHIxcWfeAZOo7kqf8gCzK fzQrtzrXH0PBY1Sf2jPnbB7fP2B6nPfrNYJh/m5hwLA5YV377P/kp27ux8muOi4yUA+o7UgqjHs k6Qs/7HfzuBWQENZ0O8dDXdB6SIJRPoZn5hyMjmXoqSEnBzEWwZc/gjS+WdWNXHOh X-Google-Smtp-Source: AFSGD/U0ZgY/Ud4UrDkZYOpdJLt/njhfOqV9Q0sx/Fu8eQDm8mnBf3Ilk9XxEHAeSjEXkyynTCZVweHIWQxhU/E= X-Received: by 2002:a24:4509:: with SMTP id y9mr8208554ita.13.1543863727305; Mon, 03 Dec 2018 11:02:07 -0800 (PST) Date: Mon, 3 Dec 2018 11:01:48 -0800 In-Reply-To: <20181203190148.93108-1-ghackmann@google.com> Message-Id: <20181203190148.93108-2-ghackmann@google.com> Mime-Version: 1.0 References: <20181203190148.93108-1-ghackmann@google.com> X-Mailer: git-send-email 2.20.0.rc1.387.gf8505762e3-goog From: Greg Hackmann To: ltp@lists.linux.it X-Virus-Scanned: clamav-milter 0.99.2 at in-6.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=-7.4 required=7.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, SPF_PASS, USER_IN_DEF_DKIM_WL autolearn=disabled version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-6.smtp.seeweb.it Cc: kernel-team@android.com Subject: [LTP] [PATCH 2/2] getrlimit/getrlimit03: add test to runtest/syscalls X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.18 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" When I added this test, I forgot to add it to runtest/syscalls. Let's fix that. Signed-off-by: Greg Hackmann --- runtest/syscalls | 1 + 1 file changed, 1 insertion(+) diff --git a/runtest/syscalls b/runtest/syscalls index ac1d2d2cd..34b47f36b 100644 --- a/runtest/syscalls +++ b/runtest/syscalls @@ -439,6 +439,7 @@ getresuid03 getresuid03 getrlimit01 getrlimit01 getrlimit02 getrlimit02 +getrlimit03 getrlimit03 get_mempolicy01 get_mempolicy01 get_robust_list01 get_robust_list01