Message ID | 20190425161416.26600-11-dima@arista.com |
---|---|
State | New |
Series | "Series without cover letter" |
Headers | show
Delivered-To: criupatchwork@gmail.com Received: from gmail-imap.l.google.com [74.125.131.108] by patchwork.criu.org with IMAP (fetchmail-6.3.26) for <root@localhost> (single-drop); Thu, 25 Apr 2019 18:15:56 +0200 (CEST) Received: by 2002:a6b:4016:0:0:0:0:0 with SMTP id k22csp2132238ioa; Thu, 25 Apr 2019 09:15:50 -0700 (PDT) X-Google-Smtp-Source: APXvYqw8yOOeg113i7qi9KN0/oMO4Yk15eqYHP2mZTiJmWoTI+zvOJJs9qIXp2z/L0iTPaNPwLfY X-Received: by 2002:a2e:7311:: with SMTP id o17mr21525351ljc.124.1556208950085; Thu, 25 Apr 2019 09:15:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556208950; cv=none; d=google.com; s=arc-20160816; b=Z5tvII1KmCbp2fE9uFRrGa8fFaml/nJvNgglRnBftzUXC3B3U1ZbSYu0QVYN9Fy/+l giAsiMAuM/1WyibMstwIt/fusts0iJ7lVLyaXvL79K6mPLJXs+W2dgQ7Ltkn1M3yNtvo EvdjW8fKMs26ucUv12oE/vCAhC47z6cP2LtP3fdMSjI/vWGGSZje3Xj0dUY3ECHGj47y ZuFIbHLHACXSruyvZLbFH2PexdutdbEACnQKDBlGcWgBxLFlJhleYA0aK9VtwWYxnR7D 83eGnW4YvZpF0B/EBSLuRl94plz2O+z2g58l0inhCzxiTcfpp1AR7XvqA3mjIT09AhcS ABrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :cc:mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature; bh=kATMagOKkNFYyJU61D9pZpvLVyJOxVGnpSWd96tCelc=; b=HrfU4w3fupKYDWUnCcC1IUGsYnNbI6YfUBnw4lF8Wxxtfe333dQLX8PH0/3zVSWO6H TmiHnpV1j5Imt/nNiBR7M1+ylbQQmtNJDcFYl4qiKEeEF32g1Ljq03Zf/73E7jr9PnSh xapywpFw0P5WpVK87+tHi5IupWBDdJx/BhR2xVYpc+GpCYqhwf7j0w0P09KHXg24buSA Y+aeyP5qQMjiQhAs1qqtKn/ZgVNDSfZEvxAaFu6sBMwxjJbkPXJIHNTX545lI9l2cRDw pcHXKDpEun6IofASolLOTmvt/hWBDvjHl8TLsWdlqaqxXGqzzGmmH0K4qc2rERa/ICQ0 cO2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@arista.com header.s=googlenew header.b=jTYhuZ24; spf=pass (google.com: domain of criu-bounces@openvz.org designates 185.231.241.50 as permitted sender) smtp.mailfrom=criu-bounces@openvz.org; dmarc=fail (p=QUARANTINE sp=REJECT dis=NONE) header.from=arista.com Return-Path: <criu-bounces@openvz.org> Received: from mail.openvz.org (mail.openvz.org. [185.231.241.50]) by mx.google.com with ESMTPS id z64si213839lfd.118.2019.04.25.09.15.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Apr 2019 09:15:50 -0700 (PDT) Received-SPF: pass (google.com: domain of criu-bounces@openvz.org designates 185.231.241.50 as permitted sender) client-ip=185.231.241.50; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@arista.com header.s=googlenew header.b=jTYhuZ24; spf=pass (google.com: domain of criu-bounces@openvz.org designates 185.231.241.50 as permitted sender) smtp.mailfrom=criu-bounces@openvz.org; dmarc=fail (p=QUARANTINE sp=REJECT dis=NONE) header.from=arista.com Received: from localhost.localdomain (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id x3PGFEiv004520; Thu, 25 Apr 2019 19:15:14 +0300 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04lp2052.outbound.protection.outlook.com [104.47.14.52]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id x3PGEWEe004310 for <criu@openvz.org>; Thu, 25 Apr 2019 19:14:32 +0300 Received: from VI1PR08CA0092.eurprd08.prod.outlook.com (2603:10a6:800:d3::18) by VE1PR08MB5101.eurprd08.prod.outlook.com (2603:10a6:803:107::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1813.14; Thu, 25 Apr 2019 16:14:35 +0000 Received: from VE1EUR01FT020.eop-EUR01.prod.protection.outlook.com (2a01:111:f400:7e01::200) by VI1PR08CA0092.outlook.office365.com (2603:10a6:800:d3::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1835.12 via Frontend Transport; Thu, 25 Apr 2019 16:14:35 +0000 Authentication-Results: spf=pass (sender IP is 209.85.208.66) smtp.mailfrom=arista.com; openvz.org; dkim=pass (signature was verified) header.d=arista.com;openvz.org; dmarc=pass action=none header.from=arista.com;compauth=pass reason=100 Received-SPF: Pass (protection.outlook.com: domain of arista.com designates 209.85.208.66 as permitted sender) receiver=protection.outlook.com; client-ip=209.85.208.66; helo=mail-ed1-f66.google.com; Received: from mail-ed1-f66.google.com (209.85.208.66) by VE1EUR01FT020.mail.protection.outlook.com (10.152.2.234) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA) id 15.20.1792.25 via Frontend Transport; Thu, 25 Apr 2019 16:14:35 +0000 Received: by mail-ed1-f66.google.com with SMTP id l25so374757eda.9 for <criu@openvz.org>; Thu, 25 Apr 2019 09:14:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=arista.com; s=googlenew; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HdqS8UeLcHDjf1Umeft7MQ/v3oy3B8NYA1tWuLl7jjg=; b=jTYhuZ240qvkUGblKcUv63Qj+gnNz1qUB3kW+2Jxhr4BNyddbstYWaeYNEg4tnjQKh lvt1WtPVowUfu/feUKEuy2h3vjlfn5OKHiI7kmV5XiboQ/atN2bbRo3hfnTjaeGRE3SH Gvn1DDL6Kky2qti7yhfaKjwOcUgQPN8dDQL4tVeKx9wMhhXNGB1apGHWX4B2l9pmEa0Z 7FmW6KwYi+80xZvh1t0r3XeVnI+mKldZLV+5ptQPhZs8pOENM5w56N6VTVwItXJzfUr7 7/v0xTGbbMRfOmVu9c7zwkegK7UNpqW6pQuhJtJxCmkPWjKmcK5u2HHplcnFZgn4tLVR 5iDQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=HdqS8UeLcHDjf1Umeft7MQ/v3oy3B8NYA1tWuLl7jjg=; b=PLlWTUWZDuuPVnv6Sc6SIhPS3xQ11jl1zkEmZMbm1b8cX14lA8Bw52Gl6NXer2zFUB vvafT7khrXUe5fruf1MLorfMWqaN1KL+2ENGMzTwNSPNHp141uCKAnY7cAwfmR7Xx5hS fsFRRvNo28E5Gsq/ywvcRtvHV7wbMNpfU1YvC6PMcRRnyqRcZL8KoLXM0yfXOxWC/GkT FUGIrEyzWDWV4wgxZhwZQRqox6c5Vk1J/CkXTAeeTgKSyW+lAvTo9fK/Y0koBd0Hxr7S SrfPKYxnlBNigbbWyhKQp0DLGOPQSsWoTAni9WnI1vv28igLqOoBIpfXjgezjeDxDGLW nYZw== X-Gm-Message-State: APjAAAUAI1uTLsQq00382dD/u0PunCfk89tEC91lKO/3tHIKOPQIyZRY 0cUa/0CtvcJBWbPSqMvfgCEt0A== X-Received: by 2002:a17:906:1dc5:: with SMTP id v5mr19411747ejh.66.1556208874919; Thu, 25 Apr 2019 09:14:34 -0700 (PDT) Received: from Mindolluin.ire.aristanetworks.com ([217.173.96.166]) by smtp.gmail.com with ESMTPSA id br19sm4147042ejb.48.2019.04.25.09.14.32 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 25 Apr 2019 09:14:33 -0700 (PDT) From: Dmitry Safonov <dima@arista.com> To: linux-kernel@vger.kernel.org Date: Thu, 25 Apr 2019 17:13:59 +0100 Message-Id: <20190425161416.26600-11-dima@arista.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190425161416.26600-1-dima@arista.com> References: <20190425161416.26600-1-dima@arista.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-EOPTenantAttributedMessage: 0bc7f26d-0264-416e-a6fc-8352af79c58f:0 X-Forefront-Antispam-Report: CIP:209.85.208.66; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(2980300002)(189003)(199004)(50226002)(1076003)(8676002)(7636002)(7596002)(50466002)(305945005)(956004)(446003)(486006)(126002)(60616004)(2160300002)(48376002)(336012)(14444005)(11346002)(246002)(16003)(2351001)(2361001)(34206002)(476003)(2616005)(107886003)(93516011)(47776003)(1096003)(6666004)(51416003)(356004)(106002)(26005)(4326008)(60626007)(95326003)(2870700001)(36756003)(54906003)(76176011)(5660300002)(59536001)(86362001); DIR:INB; SFP:; SCL:1; SRVR:VE1PR08MB5101; H:mail-ed1-f66.google.com; FPR:; SPF:Pass; LANG:en; PTR:mail-ed1-f66.google.com; MX:1; A:1; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3db48a2d-bdd3-4b51-e8fa-08d6c9991be8 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(5600141)(711020)(4605104)(4709054)(1401320)(8001031)(1421009)(1402095)(71702078); SRVR:VE1PR08MB5101; X-MS-TrafficTypeDiagnostic: VE1PR08MB5101: X-Microsoft-Antispam-Message-Info: wedLMwt5DuBDga+U57roENQNfp6VvIHV5jbKn7oKYhg92HzCqJFS0SgQ2u/RzWK78nLxIxF/h8998G6MZ7Ov1RACEgJAarmFarf1MTQYSc3cUt9rbg7y+lw0XtMpiGYtNbkLABY3MVjJ+TmGtDOQz5yT+1yLH3Qg6ps2wgXkWpBNIbR4EgSqTE2rgXzeY+iKOgGS5DL7e5zhHOi1LOD0D8J/u5yUqC6B2PWiG0EwuJ8nLPR5k9UwPNbEfgnqndnAHaUdYiAz6FSWJiBVJNFq7+n3qFwisSH+vTHCnE9vrflS672ZzJHpIKEG2meJGIB0isd0+4brM0gdsVtlNG9YkeCmLxr7svhkw90XM36Y9rr1aHRxi4fN5nZdP+puYBrKhXzT0cgX+iYsl2PoIwxHZhfb4RZG+IEd9siRyqhnmpHl0kqL1nKqzR6P0etoi1ca5RgQO7susDUIw54Dep/CatyKG0cCihYcKaTQBvW1b44u3GWiXQkSKlLTxymZtChDTzQB5hxRsdnTBJbLMENFi9VGucrn9U2ze+2YgqtImusbkWhkvHTVdyS8Fa9J/ptVwoANiPR6JCBz4+IxVw+J5UhhNRelvdMzlGzdONjjFZ9pF1sbzelnN0eoQ12CBXK9hzaMID9RxGyLBdbr8ld9et85QiNSYwlyRtG8xKsng7YOv9X/KSmKfAQd8rrf/LYXnavPXAManXq7APt3JjlGbkLmEcOKA1rhz1TYP41p3vkdtEv/QGQxh4+Xce/aTvJjQ3qIIh6svg6hiVRYJG8kOlVQrktMyRkpaupYaSSXNqw= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2019 16:14:35.3921 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3db48a2d-bdd3-4b51-e8fa-08d6c9991be8 X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR08MB5101 X-MS-Exchange-CrossPremises-OriginalClientIPAddress: 209.85.208.66 X-MS-Exchange-CrossPremises-AuthSource: VE1EUR01FT020.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossPremises-AuthAs: Anonymous X-MS-Exchange-CrossPremises-TransportTrafficType: Email X-MS-Exchange-CrossPremises-TransportTrafficSubType: X-MS-Exchange-CrossPremises-SCL: 1 X-MS-Exchange-CrossPremises-Antispam-ScanContext: DIR:Incoming; SFV:NSPM; SKIP:0; X-MS-Exchange-CrossPremises-Processed-By-Journaling: Journal Agent X-OrganizationHeadersPreserved: VE1PR08MB5101.eurprd08.prod.outlook.com Cc: Vincenzo Frascino <vincenzo.frascino@arm.com>, Arnd Bergmann <arnd@arndb.de>, linux-api@vger.kernel.org, Jeff Dike <jdike@addtoit.com>, x86@kernel.org, Oleg Nesterov <oleg@redhat.com>, criu@openvz.org, Ingo Molnar <mingo@redhat.com>, Andy Lutomirski <luto@kernel.org>, "H. Peter Anvin" <hpa@zytor.com>, Cyrill Gorcunov <gorcunov@openvz.org>, containers@lists.linux-foundation.org, Christian Brauner <christian.brauner@ubuntu.com>, Pavel Emelyanov <xemul@virtuozzo.com>, Shuah Khan <shuah@kernel.org>, Thomas Gleixner <tglx@linutronix.de> Subject: [CRIU] [PATCHv3 10/27] x86/vdso2c: Convert iterator to unsigned X-BeenThere: criu@openvz.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: CRIU development <criu.openvz.org> List-Unsubscribe: <https://lists.openvz.org/mailman/options/criu>, <mailto:criu-request@openvz.org?subject=unsubscribe> List-Archive: <http://lists.openvz.org/pipermail/criu/> List-Post: <mailto:criu@openvz.org> List-Help: <mailto:criu-request@openvz.org?subject=help> List-Subscribe: <https://lists.openvz.org/mailman/listinfo/criu>, <mailto:criu-request@openvz.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: criu-bounces@openvz.org Errors-To: criu-bounces@openvz.org |
diff --git a/arch/x86/entry/vdso/vdso2c.h b/arch/x86/entry/vdso/vdso2c.h index fa847a620f40..61c8bb2e5af8 100644 --- a/arch/x86/entry/vdso/vdso2c.h +++ b/arch/x86/entry/vdso/vdso2c.h @@ -13,7 +13,7 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len, unsigned long load_size = -1; /* Work around bogus warning */ unsigned long mapping_size; ELF(Ehdr) *hdr = (ELF(Ehdr) *)raw_addr; - int i; + unsigned int i, syms_nr; unsigned long j; ELF(Shdr) *symtab_hdr = NULL, *strtab_hdr, *secstrings_hdr, *alt_sec = NULL; @@ -86,11 +86,10 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len, strtab_hdr = raw_addr + GET_LE(&hdr->e_shoff) + GET_LE(&hdr->e_shentsize) * GET_LE(&symtab_hdr->sh_link); + syms_nr = GET_LE(&symtab_hdr->sh_size) / GET_LE(&symtab_hdr->sh_entsize); /* Walk the symbol table */ - for (i = 0; - i < GET_LE(&symtab_hdr->sh_size) / GET_LE(&symtab_hdr->sh_entsize); - i++) { - int k; + for (i = 0; i < syms_nr; i++) { + unsigned int k; ELF(Sym) *sym = raw_addr + GET_LE(&symtab_hdr->sh_offset) + GET_LE(&symtab_hdr->sh_entsize) * i; const char *name = raw_addr + GET_LE(&strtab_hdr->sh_offset) +
i and j are used everywhere with unsigned types. Cleanup and prettify the code a bit. Introduce syms_nr for readability and as a preparation for allocating an array of vDSO entries that will be needed for creating two vdso .so's: one for host tasks and another for processes inside time namespace. Signed-off-by: Dmitry Safonov <dima@arista.com> --- arch/x86/entry/vdso/vdso2c.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)