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=-7.1 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, UNWANTED_LANGUAGE_BODY,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 E0EF8C3A589 for ; Thu, 15 Aug 2019 16:39:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AD418206C1 for ; Thu, 15 Aug 2019 16:39:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=arista.com header.i=@arista.com header.b="b4qBCjuT" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732473AbfHOQjM (ORCPT ); Thu, 15 Aug 2019 12:39:12 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:38051 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732446AbfHOQjK (ORCPT ); Thu, 15 Aug 2019 12:39:10 -0400 Received: by mail-wr1-f67.google.com with SMTP id g17so2773194wrr.5 for ; Thu, 15 Aug 2019 09:39:09 -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=LDD6ysbcq8/fi6dGyfg9N1McraInCy0n2bZF6snhbRo=; b=b4qBCjuTQdhVT0a0DmGBDt27OIcVE/oifHPx8Xk2ziMixcZTCNurZMkB9t7p6ykFMo cJoRdjNKK3NerjMF6YNTgxQXPO5lwrT6E+zIBjXnxsMGJiRbiwov3m35vt5TCmlwODsS S7WOCJ75wVaTHiAGrQHQpbe475zAQ1bQzlC8/2rE3OLLUzNvVqaJstgGu/lWFOzSJTTL pbhnWdgDVm7rfw9leeSIDakdIFUYdpezD8CPifJ9pSF6ltpAEb6bLC3/UZPwWcQWTP3m nKpowXB9iObJ6wmavFsae0yVN0IJgILdn90r7D9XrpA1w1D1PX9//0GRx1tyP5mLbTYz IjqA== 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=LDD6ysbcq8/fi6dGyfg9N1McraInCy0n2bZF6snhbRo=; b=ndxDfTgazM6ho+GBID634vJxYoHqh8r89XCK9pldSRkPVz5n4sud9U8ccXCvR+g610 5FnYe+P47jqQeMoa8DOiGyBuYuUCE12KO5Ljp+WMWYB5/acAfN2A8L94U+j/qUWcA63m RAkIU1cIDYoAF9WAQgCuBR/YYcqXMfyyajGnFLIpgnqmCqgqupSPOerYZUDq/3jjhlUz aeuOH8mgDkFPxKMZbBFNS006CLv70I62GUUeRYDKXXyXc8pFfhwipJTcxQuVlU6FaoUE swTvy2+jnoyrYWvoOdxUIinXpaEuWD7+gKLQCmdWlhG7FL2cdItUOCYuQxdJ1y12Y08Q ZgDQ== X-Gm-Message-State: APjAAAVre/7J/3+wBG6Pr2hen/mznuiNZanmcxrxhLhugmkIinmCIdky 0CwBd2uM1r5EfpEMmjbtbYxaAhHniQ0= X-Google-Smtp-Source: APXvYqwF6j5VaRNoIPJFWV8Tckhi+PRI/dVzMoI+OPEinPS+a5V1GrKb0SAQztAOJ/JdBaxD6XREkw== X-Received: by 2002:adf:e790:: with SMTP id n16mr6224693wrm.120.1565887148204; Thu, 15 Aug 2019 09:39:08 -0700 (PDT) Received: from Mindolluin.ire.aristanetworks.com ([217.173.96.166]) by smtp.gmail.com with ESMTPSA id f7sm5755046wrf.8.2019.08.15.09.39.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Aug 2019 09:39:07 -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: [PATCHv6 21/36] x86/vdso: Rename vdso_image {.data=>.text} Date: Thu, 15 Aug 2019 17:38:21 +0100 Message-Id: <20190815163836.2927-22-dima@arista.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190815163836.2927-1-dima@arista.com> References: <20190815163836.2927-1-dima@arista.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org To avoid any confusion with VVAR. Co-developed-by: Andrei Vagin Signed-off-by: Andrei Vagin Signed-off-by: Dmitry Safonov --- arch/x86/entry/vdso/vdso2c.h | 2 +- arch/x86/entry/vdso/vma.c | 6 +++--- arch/x86/include/asm/vdso.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/x86/entry/vdso/vdso2c.h b/arch/x86/entry/vdso/vdso2c.h index 80be339ee93e..7556bb70ed8b 100644 --- a/arch/x86/entry/vdso/vdso2c.h +++ b/arch/x86/entry/vdso/vdso2c.h @@ -158,7 +158,7 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len, fprintf(outfile, "\n};\n\n"); fprintf(outfile, "const struct vdso_image %s = {\n", image_name); - fprintf(outfile, "\t.data = raw_data,\n"); + fprintf(outfile, "\t.text = raw_data,\n"); fprintf(outfile, "\t.size = %lu,\n", mapping_size); if (alt_sec) { fprintf(outfile, "\t.alt = %lu,\n", diff --git a/arch/x86/entry/vdso/vma.c b/arch/x86/entry/vdso/vma.c index 3f05418642a8..2dc4f0b5481c 100644 --- a/arch/x86/entry/vdso/vma.c +++ b/arch/x86/entry/vdso/vma.c @@ -32,8 +32,8 @@ void __init init_vdso_image(const struct vdso_image *image) { BUG_ON(image->size % PAGE_SIZE != 0); - apply_alternatives((struct alt_instr *)(image->data + image->alt), - (struct alt_instr *)(image->data + image->alt + + apply_alternatives((struct alt_instr *)(image->text + image->alt), + (struct alt_instr *)(image->text + image->alt + image->alt_len)); } @@ -47,7 +47,7 @@ static vm_fault_t vdso_fault(const struct vm_special_mapping *sm, if (!image || (vmf->pgoff << PAGE_SHIFT) >= image->size) return VM_FAULT_SIGBUS; - vmf->page = virt_to_page(image->data + (vmf->pgoff << PAGE_SHIFT)); + vmf->page = virt_to_page(image->text + (vmf->pgoff << PAGE_SHIFT)); get_page(vmf->page); return 0; } diff --git a/arch/x86/include/asm/vdso.h b/arch/x86/include/asm/vdso.h index 230474e2ddb5..dffdc12cc7d6 100644 --- a/arch/x86/include/asm/vdso.h +++ b/arch/x86/include/asm/vdso.h @@ -11,7 +11,7 @@ #include struct vdso_image { - void *data; + void *text; unsigned long size; /* Always a multiple of PAGE_SIZE */ unsigned long alt, alt_len; -- 2.22.0