From patchwork Mon Oct 1 17:11:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kenneth Magic X-Patchwork-Id: 977299 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="Iws2rGil"; 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 42P82Y1CGMz9s4V for ; Tue, 2 Oct 2018 03:11:29 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 99C713E748B for ; Mon, 1 Oct 2018 19:11:25 +0200 (CEST) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-3.smtp.seeweb.it (in-3.smtp.seeweb.it [IPv6:2001:4b78:1:20::3]) by picard.linux.it (Postfix) with ESMTP id 1326A3E742A for ; Mon, 1 Oct 2018 19:11:23 +0200 (CEST) Received: from mail-qk1-x749.google.com (mail-qk1-x749.google.com [IPv6:2607:f8b0:4864:20::749]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by in-3.smtp.seeweb.it (Postfix) with ESMTPS id 2A5C31A00A2F for ; Mon, 1 Oct 2018 19:11:22 +0200 (CEST) Received: by mail-qk1-x749.google.com with SMTP id g26-v6so15104728qkm.20 for ; Mon, 01 Oct 2018 10:11:22 -0700 (PDT) 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=1+lU6SjUK1jgPFMFuQ8qG2Jb32FTRc7QIZxV40xw4d0=; b=Iws2rGiluneuv51muRLZ8z23etwQ6SqtrL2JzF1lKJK3wVMvUFvoqH9uUxp4i2Th29 ircYc8JVWRgFMQe5A1Rk8bU2SSTqwxhpOw47cUS45ULvPduL0DABdrEHWO85eDVyYPDF ODK5/BbbsJqHLoTSHFbx/Ez1VCrPjWfgQPT+oWttEReqNfxCoBncJF01sbS6cfY5FZ6A 9+YMQL0uKO+3q1B8KwdPjy7SBrwLg2RVfWLQsp1EmzFhTE2S1wJNdc9peacMbYLU1k8b ht1tQK3/VwHFYc2sNvFjStFRztwos3ZY4hoFHr/paYlZWJtXCZ8ooMcOvKaUjHOgRtjb h2gg== 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=1+lU6SjUK1jgPFMFuQ8qG2Jb32FTRc7QIZxV40xw4d0=; b=RxprqQo6oo3lKKR4AatDGm1UgsHKTMI2IILdguyVj2rA1Xoam8ul1HisvzxWPofMd7 YbnN7Tfv0QGraGwLlA/tRA7AxdioysXW6gx7iv/P/p7fUA5i4ptcyUq55q/FWv2XBbEg r9kddH7vgJ40qcQzHXTQrNFG8ZaSklgyhSJZXEP6h8fakzM5ay5vjh1DNIszvsiRZWaT 2Y7Db4rWBpN5ClRB19+cjkRxJFpKhpViiJ6vsAQzUPTOwIAtwPObXtvps1wvZ1CyU8Vp W0FMaehAQRWrpQhK5Na0eNKu+LKIOTO7DOdqLkSdkOtfGFqsobFzX6bkJ9J9FxPEWwOQ K7tA== X-Gm-Message-State: ABuFfogPvU0OggJcgLCe7Fu3W0x7+2jYe++g/ios1iEgP6ItAvRlcTdr Tdi37u1xJdhnCtyXTyiiCbj6Pl2nK184lhjQk33rOW7YemoBWppkAWfYEzDwFTOap+yzmf1hrA3 z/YzvCV+i13vrOYoHXA8O5w9OPrDuEuMyADf0osIdMd8A2p0ZshGinHhw X-Google-Smtp-Source: ACcGV60ePLi1il3Lm496zfSNexWQCqo5cTj5t+7tUsgVyRZuDAeRYNadsNlsh/qk3q+Cgpu6YaUeGNPoG3E= X-Received: by 2002:a37:9bcb:: with SMTP id d194-v6mr8160276qke.30.1538413880848; Mon, 01 Oct 2018 10:11:20 -0700 (PDT) Date: Mon, 1 Oct 2018 10:11:16 -0700 Message-Id: <20181001171116.235573-1-kmagic@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.19.0.605.g01d371f741-goog From: kmagic@google.com To: ltp@lists.linux.it X-Virus-Scanned: clamav-milter 0.99.2 at in-3.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-3.smtp.seeweb.it Cc: Kenneth Magic Subject: [LTP] [PATCH] Correct the kernel_bits value in x86 PER_LINUX32. 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" From: Kenneth Magic Android runs all 32bit programs in a PER_LIINUX32 personality even under a 64 bit kernel, causing the machine to show up as "i686". Check for and correct this case so tests use the correct kernel_bits value. Signed-off-by: Kenneth Magic Reviewed-by: Petr Vorel --- lib/tst_kernel.c | 47 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 41 insertions(+), 6 deletions(-) diff --git a/lib/tst_kernel.c b/lib/tst_kernel.c index 4206e3c0d..d051f3b07 100644 --- a/lib/tst_kernel.c +++ b/lib/tst_kernel.c @@ -15,21 +15,28 @@ * along with this program. If not, see . */ +#include #include #include "test.h" #include "tst_kernel.h" -int tst_kernel_bits(void) +static int get_kernel_bits_from_uname(struct utsname *buf) { - struct utsname buf; - int kernel_bits; - - if (uname(&buf)) { + if (uname(buf)) { tst_brkm(TBROK | TERRNO, NULL, "uname()"); return -1; } - kernel_bits = strstr(buf.machine, "64") ? 64 : 32; + return strstr(buf->machine, "64") ? 64 : 32; +} + +int tst_kernel_bits(void) +{ + struct utsname buf; + int kernel_bits = get_kernel_bits_from_uname(&buf); + + if (kernel_bits == -1) + return -1; /* * ARM64 (aarch64) defines 32-bit compatibility modes as @@ -40,6 +47,34 @@ int tst_kernel_bits(void) || !strcmp(buf.machine, "s390x")) kernel_bits = 64; +#ifdef __ANDROID__ + /* Android's bionic libc sets the PER_LINUX32 personality for all 32-bit + * programs. This will cause buf.machine to report as i686 even though + * the kernel itself is 64-bit. + */ + if (!strcmp(buf.machine, "i686") && + (personality(0xffffffff) & PER_MASK) == PER_LINUX32) { + /* Set the personality back to the default. */ + if (personality(PER_LINUX) == -1) { + tst_brkm(TBROK | TERRNO, NULL, "personality()"); + return -1; + } + + /* Redo the uname check without the PER_LINUX32 personality to + * determine the actual kernel bits value. + */ + kernel_bits = get_kernel_bits_from_uname(&buf); + if (kernel_bits == -1) + return -1; + + /* Set the personality back to PER_LINUX32. */ + if (personality(PER_LINUX32) == -1) { + tst_brkm(TBROK | TERRNO, NULL, "personality()"); + return -1; + } + } +#endif /* __ANDROID__ */ + tst_resm(TINFO, "uname.machine=%s kernel is %ibit", buf.machine, kernel_bits);