From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 68A8EC76186 for ; Mon, 29 Jul 2019 21:58:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3D5FD20C01 for ; Mon, 29 Jul 2019 21:58:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=arista.com header.i=@arista.com header.b="NLaEBoeZ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730337AbfG2V6b (ORCPT ); Mon, 29 Jul 2019 17:58:31 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:44352 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389273AbfG2V62 (ORCPT ); Mon, 29 Jul 2019 17:58:28 -0400 Received: by mail-wr1-f66.google.com with SMTP id p17so63447530wrf.11 for ; Mon, 29 Jul 2019 14:58:27 -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=eQTvfg8Tpo4N8AzFTEat5V09DvUQksH5vgyoMyK5UTo=; b=NLaEBoeZTwPxMkgcmIz5vSw3SbBuMmx/qS0b8Fx5gte/oiZ6F7BusGo71S2hsYxYyw sCGf03gIKzWNLG9ZQnZGG6eDBUB2135zeGJVOsz5PBAJB5ktk+pgZsPvz61NPGxoWDI5 YLxbKs4dYFOJ8UP08nBW1oVqMURXEC1usMeQhF751DA0+4mER4w+tWpmCthUvwc3hlhE 3p6lNCce1osI3dY8leTznQTuFZw4DFCLtC8+mhPG2bjfDUK/lMInpJlm/BiU06Ej3/4x IHkz0Pp9OjVWjp3apin3No/JflZaIYZNa6FCI2f+8oZ33ex7ea8+V5qVLDGV9hTUhw/g T1lA== 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=eQTvfg8Tpo4N8AzFTEat5V09DvUQksH5vgyoMyK5UTo=; b=VEtQCUlsofzaW9gRm3lT+sBKtCn8V8xcpDX2DxCFf6sB05MsyLgJPLw4CIUzFwJjB6 dv5XXLos6VpipKWJEUTovpKc1HvoR7yuwOwsNje3QlKCruF7JSH5WpIFsCVACYxNuuQb Up8xRc+JsG313y7MqxxVCT01kDLUtTVA368+XvYsZ0ilNQnBvdiPYiJRn2R55CAUa9Wc 0lgp71lU05RrmY5EvNWayiqDxWJCMNS9u21f0epzvT/BK2Gdoaa92Q/yQOqbsYSEXGhk aMnmYpV6S3cta2MkJGyX5eaBJK9MCqIqnfM6geq293XLHMs8OcDW8luWO0kkIgCQF66H s0Ng== X-Gm-Message-State: APjAAAX1YRk5VFciGFEbfyFNFRb+ov3GtpWl3oabgBdCvOI4BrEmQQt4 jbpWe+cmTBW+DcDzmLEFgbmUVPYiLMonT+7zVVCsKF469bMav9LXdJz6aO50uloEWLEc4rM4/dB ABeRnt/vOEyq9ArnCuEH5lI8XDwUUsmTH7HNBUoe4HKsts7GnYQMFd8h/zeTdvi6EQUgNVMubs3 uwbCSsYgdTjeef+xofo3Xl17rKOm2IuFVFkm0GL2E= X-Google-Smtp-Source: APXvYqw7JuvakPP3L9h8/7x/ktyciKK0UqTWtoa9A4x8UUTtY1gHos1WvIOBr2xACzdJnnLxdgNNCw== X-Received: by 2002:adf:c803:: with SMTP id d3mr48994066wrh.130.1564437506554; Mon, 29 Jul 2019 14:58:26 -0700 (PDT) Received: from Mindolluin.ire.aristanetworks.com ([217.173.96.166]) by smtp.gmail.com with ESMTPSA id x20sm49230728wmc.1.2019.07.29.14.58.25 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 29 Jul 2019 14:58:25 -0700 (PDT) From: Dmitry Safonov To: linux-kernel@vger.kernel.org Cc: Dmitry Safonov <0x7f454c46@gmail.com>, Dmitry Safonov , Adrian Reber , Andrei Vagin , Andy Lutomirski , Arnd Bergmann , Christian Brauner , Cyrill Gorcunov , "Eric W. Biederman" , "H. Peter Anvin" , Ingo Molnar , Jann Horn , Jeff Dike , Oleg Nesterov , Pavel Emelyanov , Shuah Khan , Thomas Gleixner , Vincenzo Frascino , containers@lists.linux-foundation.org, criu@openvz.org, linux-api@vger.kernel.org, x86@kernel.org Subject: [PATCHv5 19/37] x86/vdso2c: Convert iterator to unsigned Date: Mon, 29 Jul 2019 22:57:01 +0100 Message-Id: <20190729215758.28405-20-dima@arista.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190729215758.28405-1-dima@arista.com> References: <20190729215758.28405-1-dima@arista.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CLOUD-SEC-AV-Info: arista,google_mail,monitor X-CLOUD-SEC-AV-Sent: true X-Gm-Spam: 0 X-Gm-Phishy: 0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. Co-developed-by: Andrei Vagin Signed-off-by: Andrei Vagin Signed-off-by: Dmitry Safonov --- arch/x86/entry/vdso/vdso2c.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/arch/x86/entry/vdso/vdso2c.h b/arch/x86/entry/vdso/vdso2c.h index a20b134de2a8..80be339ee93e 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 *sym_name = raw_addr + -- 2.22.0