From nobody Thu Dec 18 08:11:51 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1765876684; cv=none; d=zohomail.com; s=zohoarc; b=Jsyw+b963fb8XgOUkoKZzFt3DDlw8J7uCwhBoEi3rmjnHVODMnel5SZsdIxsAFp6NtXoAx4FaRHPtbvMMPjwQduCcxxrvmhUqxt64FznVOhNabjZYtWrgf+Rtt5Cmw6trwlmt9B0wK2hzq/8HQXMA+Gdjjy2KjDDZQ8CJerHHuE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765876684; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=mT5y1doBjol1xTeNjUjhfdne9i1b4Rk9NW6N2DKeGyU=; b=VujmqaC9SdJi67hEz00Spjy3ZEsBOD4PaGpNTrQ8Dd6iQqDAjWHZ0HKzlbAdDb5Yl8lOxwUA7QYNpKxMZp2RuZMwbjjoNavv5o9LECfxtyevfQSlz36rTheQs8m/U574wxBJW71/WGcPy0NjEOwFS9+OlBTBeoqnTZ5SO+PsAD4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1765876684259294.4672746389207; Tue, 16 Dec 2025 01:18:04 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1187735.1509063 (Exim 4.92) (envelope-from ) id 1vVRBi-0002xN-IV; Tue, 16 Dec 2025 09:17:46 +0000 Received: by outflank-mailman (output) from mailman id 1187735.1509063; Tue, 16 Dec 2025 09:17:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vVRBi-0002xG-Fv; Tue, 16 Dec 2025 09:17:46 +0000 Received: by outflank-mailman (input) for mailman id 1187735; Tue, 16 Dec 2025 09:17:45 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vVRBh-0002x8-Fo for xen-devel@lists.xenproject.org; Tue, 16 Dec 2025 09:17:45 +0000 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [2a00:1450:4864:20::32c]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 13bb2a9d-da60-11f0-9cce-f158ae23cfc8; Tue, 16 Dec 2025 10:17:43 +0100 (CET) Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-47775fb6c56so34496735e9.1 for ; Tue, 16 Dec 2025 01:17:43 -0800 (PST) Received: from [10.156.60.236] (ip-037-024-206-209.um08.pools.vodafone-ip.de. [37.24.206.209]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47bd994a221sm5168825e9.7.2025.12.16.01.17.42 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 16 Dec 2025 01:17:42 -0800 (PST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 13bb2a9d-da60-11f0-9cce-f158ae23cfc8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1765876663; x=1766481463; darn=lists.xenproject.org; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=mT5y1doBjol1xTeNjUjhfdne9i1b4Rk9NW6N2DKeGyU=; b=X26opvL3kwXVy/rjEeV0cxxEP4a1p45wAZfizDK4XtgPlOVa4MCFGqayLmgytUBCzx zyKKvt+TZwONTdkE7Xz/o3sEVzbSAmrdi/7nIL01kSeeCb5PHvOdYgBAODeQVaxlDbJo 7rgGYQ0AVhqsMLf3ZMBjJsvy5SF3i3z3bAn1HVOzJwfTZtNpH2QTOamQ1pF3GS8/+E76 e2m7Ydo9C3M5VwzaLGOHKJEH1d3BsndNMmhnMoyIZYgn6wsKOhMGcfHWIK89vjOHG4WQ HKDy6b2ODZ9McAH3hIy5tSRWpV1KC+KE0i9XAhAnqGYT6LAXrcE+l5CPEtVmV7+CMsAL 5v1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765876663; x=1766481463; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=mT5y1doBjol1xTeNjUjhfdne9i1b4Rk9NW6N2DKeGyU=; b=kxKot6muW219uo3IGTaP34O+mla8Nd41mlCvXXkmWcHQqyR8hILHE77t546LHlshJn KKdxpS64k1iaf86LKneWsLQGdh0O0qEcXKIffiSNIRRlKkiOkj5D4YWdsiy2Aoyp42y4 eft7nOEJuUmNUQrb51rFdoywcYK1V0BH6IjoA5VQWrbp+UYqiy3b4bjy0UoU8xSw4yJY cdPBHH0cZXTkdQTjCFqWbw4IADY3yJdC/YdjLbGD/Md5/R46DVL+zAPlbYjoMr8nC2JI MXlPo8IE/YtEbsiZ1dk0aSyKYKZmJG+0C44UrQGCftngjsgtOhXSsdz0teLsqR+7C2S3 5gdw== X-Gm-Message-State: AOJu0YwCKjekaJfOPCMtlvItClNhIsiBsEDMA8U+dw7iYb+5M26Q+oC8 I6pCWabqf6yJKjHG9nwIbvKfqNSVqd6cxMigc0dVGVyJnqzP0wGBHpRYz6SLyqFqhg19XyzVvpD 8gKI= X-Gm-Gg: AY/fxX4O8SrJE6zyA6k6QOwxxsS6X21GcjYOIeNxHGeVpCd4zVrytnkzWgogHXmfjhk +n3c69yiuGlccjsvCAaVmxfMfwU2KmEU3HCWna/QyGRAElWbEK/nFgEDCtpZ9/I+r/pNod9xS1m tb/NiDt94ZfE5x1UhOpz0We8YpF2+6qB0P7bd2oRxHn6cZttOC+zD2oOUC7NOZN+5N8DeVs09e8 LyR4bK5Uk17R4gLXxjzw+IAoK0TjmSyOOKUl/K6E7A+QJe8fRy7jpS9N93bUEkFVgnJDF+OIqEU Jr7+Q3JSd39DoaN7D0GjEYoyOPJUY/6W3rPGhdJrcPvB/yQZK/5TIyBkdhmmQbVhCZGBmloVj7X Ym2taCvvb6jXaO0SldDTMlf1XCvdZRmRhTI4RXAptvMlWUR57lauU0GRQuJCRiEZ1Rk4XWo9eph pCEjndMA3fMe02CgjBo0YlLwgH5oXyexbdRIa9y8VEHcAEwUeW2X8pW+abEZ4Y7fiiMiX4V2WLE FU= X-Google-Smtp-Source: AGHT+IFIlf8eBMdfZOOTZiCrgCkemefiQIJq7j4U0mcKyHYM+8dGEgWaODE39483yOnu0bMm6VNQVA== X-Received: by 2002:a05:600c:8184:b0:46e:6d5f:f68 with SMTP id 5b1f17b1804b1-47bda6f331emr1503905e9.12.1765876662662; Tue, 16 Dec 2025 01:17:42 -0800 (PST) Message-ID: <0ba4df43-e071-4705-a18e-d41636946d3a@suse.com> Date: Tue, 16 Dec 2025 10:17:41 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH v3 1/3] x86: move / split usercopy.c to / into arch-specific library From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , =?UTF-8?Q?Roger_Pau_Monn=C3=A9?= , Grygorii Strashko References: Content-Language: en-US Autocrypt: addr=jbeulich@suse.com; keydata= xsDiBFk3nEQRBADAEaSw6zC/EJkiwGPXbWtPxl2xCdSoeepS07jW8UgcHNurfHvUzogEq5xk hu507c3BarVjyWCJOylMNR98Yd8VqD9UfmX0Hb8/BrA+Hl6/DB/eqGptrf4BSRwcZQM32aZK 7Pj2XbGWIUrZrd70x1eAP9QE3P79Y2oLrsCgbZJfEwCgvz9JjGmQqQkRiTVzlZVCJYcyGGsD /0tbFCzD2h20ahe8rC1gbb3K3qk+LpBtvjBu1RY9drYk0NymiGbJWZgab6t1jM7sk2vuf0Py O9Hf9XBmK0uE9IgMaiCpc32XV9oASz6UJebwkX+zF2jG5I1BfnO9g7KlotcA/v5ClMjgo6Gl MDY4HxoSRu3i1cqqSDtVlt+AOVBJBACrZcnHAUSuCXBPy0jOlBhxPqRWv6ND4c9PH1xjQ3NP nxJuMBS8rnNg22uyfAgmBKNLpLgAGVRMZGaGoJObGf72s6TeIqKJo/LtggAS9qAUiuKVnygo 3wjfkS9A3DRO+SpU7JqWdsveeIQyeyEJ/8PTowmSQLakF+3fote9ybzd880fSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPsJgBBMRAgAgBQJZN5xEAhsDBgsJCAcDAgQVAggDBBYC AwECHgECF4AACgkQoDSui/t3IH4J+wCfQ5jHdEjCRHj23O/5ttg9r9OIruwAn3103WUITZee e7Sbg12UgcQ5lv7SzsFNBFk3nEQQCACCuTjCjFOUdi5Nm244F+78kLghRcin/awv+IrTcIWF hUpSs1Y91iQQ7KItirz5uwCPlwejSJDQJLIS+QtJHaXDXeV6NI0Uef1hP20+y8qydDiVkv6l IreXjTb7DvksRgJNvCkWtYnlS3mYvQ9NzS9PhyALWbXnH6sIJd2O9lKS1Mrfq+y0IXCP10eS FFGg+Av3IQeFatkJAyju0PPthyTqxSI4lZYuJVPknzgaeuJv/2NccrPvmeDg6Coe7ZIeQ8Yj t0ARxu2xytAkkLCel1Lz1WLmwLstV30g80nkgZf/wr+/BXJW/oIvRlonUkxv+IbBM3dX2OV8 AmRv1ySWPTP7AAMFB/9PQK/VtlNUJvg8GXj9ootzrteGfVZVVT4XBJkfwBcpC/XcPzldjv+3 HYudvpdNK3lLujXeA5fLOH+Z/G9WBc5pFVSMocI71I8bT8lIAzreg0WvkWg5V2WZsUMlnDL9 mpwIGFhlbM3gfDMs7MPMu8YQRFVdUvtSpaAs8OFfGQ0ia3LGZcjA6Ik2+xcqscEJzNH+qh8V m5jjp28yZgaqTaRbg3M/+MTbMpicpZuqF4rnB0AQD12/3BNWDR6bmh+EkYSMcEIpQmBM51qM EKYTQGybRCjpnKHGOxG0rfFY1085mBDZCH5Kx0cl0HVJuQKC+dV2ZY5AqjcKwAxpE75MLFkr wkkEGBECAAkFAlk3nEQCGwwACgkQoDSui/t3IH7nnwCfcJWUDUFKdCsBH/E5d+0ZnMQi+G0A nAuWpQkjM1ASeQwSHEeAWPgskBQL In-Reply-To: Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1765876686776154100 Content-Type: text/plain; charset="utf-8" The file wasn't correctly named for our purposes anyway. Split it into its "guest" and "unsafe" parts, thus allowing the latter to not be linked in at all (for presently having no caller). The building of the "guest" part can then (later) become conditional upon PV=3Dy. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper Reviewed-by: Grygorii Strashko --- v3: Retain xen/sched.h #include. --- xen/arch/x86/Makefile | 4 ---- xen/arch/x86/lib/Makefile | 2 ++ xen/arch/x86/{usercopy.c =3D> lib/copy-guest.c} | 12 ++-------- xen/arch/x86/lib/copy-unsafe.c | 22 +++++++++++++++++++ 4 files changed, 26 insertions(+), 14 deletions(-) rename xen/arch/x86/{usercopy.c =3D> lib/copy-guest.c} (94%) create mode 100644 xen/arch/x86/lib/copy-unsafe.c diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 61e2293a467e..dfb258d7ac1c 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -72,7 +72,6 @@ obj-y +=3D time.o obj-y +=3D traps-setup.o obj-y +=3D traps.o obj-$(CONFIG_INTEL) +=3D tsx.o -obj-y +=3D usercopy.o obj-y +=3D x86_emulate.o obj-$(CONFIG_TBOOT) +=3D tboot.o obj-y +=3D hpet.o @@ -93,9 +92,6 @@ hostprogs-y +=3D efi/mkreloc =20 $(obj)/efi/mkreloc: HOSTCFLAGS +=3D -I$(srctree)/include =20 -# Allows usercopy.c to include itself -$(obj)/usercopy.o: CFLAGS-y +=3D -iquote . - ifneq ($(CONFIG_HVM),y) $(obj)/x86_emulate.o: CFLAGS-y +=3D -Wno-unused-label endif diff --git a/xen/arch/x86/lib/Makefile b/xen/arch/x86/lib/Makefile index ddf7e19bdc1d..8fe2dfd88553 100644 --- a/xen/arch/x86/lib/Makefile +++ b/xen/arch/x86/lib/Makefile @@ -1 +1,3 @@ +lib-y +=3D copy-guest.o +lib-y +=3D copy-unsafe.o lib-y +=3D generic-hweightl.o diff --git a/xen/arch/x86/usercopy.c b/xen/arch/x86/lib/copy-guest.c similarity index 94% rename from xen/arch/x86/usercopy.c rename to xen/arch/x86/lib/copy-guest.c index a24b52cc66c1..73284b3f14be 100644 --- a/xen/arch/x86/usercopy.c +++ b/xen/arch/x86/lib/copy-guest.c @@ -1,4 +1,4 @@ -/*=20 +/* * User address space access functions. * * Copyright 1997 Andi Kleen @@ -6,8 +6,8 @@ * Copyright 2002 Andi Kleen */ =20 -#include #include + #include =20 #ifndef GUARD @@ -139,14 +139,6 @@ unsigned int copy_from_guest_pv(void *to, const void _= _user *from, return n; } =20 -# undef GUARD -# define GUARD UA_DROP -# define copy_to_guest_ll copy_to_unsafe_ll -# define copy_from_guest_ll copy_from_unsafe_ll -# undef __user -# define __user -# include __FILE__ - #endif /* GUARD(1) */ =20 /* diff --git a/xen/arch/x86/lib/copy-unsafe.c b/xen/arch/x86/lib/copy-unsafe.c new file mode 100644 index 000000000000..a51500370fb1 --- /dev/null +++ b/xen/arch/x86/lib/copy-unsafe.c @@ -0,0 +1,22 @@ +/* + * "Unsafe" access functions. + */ + +#include + +#define GUARD UA_DROP +#define copy_to_guest_ll copy_to_unsafe_ll +#define copy_from_guest_ll copy_from_unsafe_ll +#undef __user +#define __user +#include "copy-guest.c" + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ From nobody Thu Dec 18 08:11:51 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1765876703; cv=none; d=zohomail.com; s=zohoarc; b=DSsl7nCcqz9JiMPk5WMPXE9qohGX/GBTbNrzX8a/EtzGtiYnwvDCVeMAWYT5nzFHJWtDx2IPxaovZT2PPiGr/Drzk5pg2/kmh8zsIFULJ2dM39lfmefoGIalUNcSSSTkQiBPfer92qmi9tE0vKu6fGdrrt2QyudWgqNgrvXuQIs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765876703; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=h64sTDLguGxk8lP/Vg5Q4BOrQyBRO8zqvkCiMvX5SkE=; b=SuEBsmI+eGElJJIcf8h1OKI+JH+nGSe9gIGgiUkMpr822ust8iK48LTT3e5XTPMMP7z09YMMjaTqlvLHKnHwJTdw+GqNd7xp0a+HjejyqNgo7jiuI1P7JJMoMcT6TzAwdufWtpUmz6T0QBvdNiTYkW9VKFPZ3iEjXLoUZ6J+Arw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1765876703677912.7715247699143; Tue, 16 Dec 2025 01:18:23 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1187737.1509074 (Exim 4.92) (envelope-from ) id 1vVRC1-0003Jb-R5; Tue, 16 Dec 2025 09:18:05 +0000 Received: by outflank-mailman (output) from mailman id 1187737.1509074; Tue, 16 Dec 2025 09:18:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vVRC1-0003JU-Mz; Tue, 16 Dec 2025 09:18:05 +0000 Received: by outflank-mailman (input) for mailman id 1187737; Tue, 16 Dec 2025 09:18:04 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vVRC0-0002x8-Gu for xen-devel@lists.xenproject.org; Tue, 16 Dec 2025 09:18:04 +0000 Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [2a00:1450:4864:20::42d]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 1f4279c6-da60-11f0-9cce-f158ae23cfc8; Tue, 16 Dec 2025 10:18:02 +0100 (CET) Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-430fbb6012bso1540944f8f.1 for ; Tue, 16 Dec 2025 01:18:02 -0800 (PST) Received: from [10.156.60.236] (ip-037-024-206-209.um08.pools.vodafone-ip.de. [37.24.206.209]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-42fa8b9b750sm33747905f8f.42.2025.12.16.01.18.01 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 16 Dec 2025 01:18:01 -0800 (PST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 1f4279c6-da60-11f0-9cce-f158ae23cfc8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1765876682; x=1766481482; darn=lists.xenproject.org; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=h64sTDLguGxk8lP/Vg5Q4BOrQyBRO8zqvkCiMvX5SkE=; b=DCYV9XdnnkjvQLj1XegC1ZNBcfauGowunyvupf0VVS6KyiFBCnUoGSITCnOzZwUjIe MNMj+0t4iGPrflDpvcsjJvh89J3A1oXCw0rOLweRhnsVTjP+xGfWRxRpzNLdX/LYFGbC AFsMC68ehbnXrFgvJ4SzTqxHE/eGoqtzpn3y+7TIUWgGHMSGrRVA5GVwJcTioxGrao9T kKTqv/CRutMnBKApDHLeYr+7VdoICSunb3o8gtvg0g/6O5I9lG1dcuYfMEV5540/M6Ka Yj5oke6ois3VF5o7W1rI8Z+HYN39stp8/IVG50wuzjRFIqkCswRlRp80odTfiAKbwkit a0Ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765876682; x=1766481482; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=h64sTDLguGxk8lP/Vg5Q4BOrQyBRO8zqvkCiMvX5SkE=; b=LV3ZRcEONY51JHENZffl6y31jF5CDHTdESIkHhLbGVYDsN8Y2tzd51vQKdju5PrIl8 et8EIZP3Vnr++4LAeOAwi0SENQrnay25qviebcZ8wUwqj6U4NQveVI3qsLa3DgkT1ACn nGtR4cmrto3sbm6FKqXrW+Zw2+88u2481j3ll/FT/4aGhtHYEHy2ddcEakcUtWzKNBeb VMOPzsX5kdUwlq0/6C9VhPu3kvhPIM0juoCW1D97O+keS2uw0zdh/bVJC/NLTWZfWnzj Odp8pQMavI2na9vV5H8Bcmaq1803uxNrAdbuMJm3/HwJpshrtTT1enTDyCXL/jfZgKl0 ntuQ== X-Gm-Message-State: AOJu0Yze0PyPQ5C+mF9D4TngatUi7SYFUMXu5ZiFFJzyKzOzOGkdbxYz Q3jQPqdemdHxNE/EjSGpDOE+IOXNcwBYXSvqtac7JNCBBmhK1IOxMuamon85sN1T3PVsemIkGYf 2eQw= X-Gm-Gg: AY/fxX5b56UlAYx+mPZTqA1hG6RJxk2NBIB0bZsXN5003vNhAYqwlxISd0KU1LoC/qK KV8W0X5g5bNDEIsYuAb4bHkUa/R08OMwv0z+j4g8i2f3hTxXDmCUI06LDKDaNDMHEAthNQ9TRZY MplNLSirANcDGe3KnJZQJvownUY9eaWER8ZysQSLyqHYB3l0Ei6n0yURStz9G0eTHre00Ebw1bZ ProY/wO9hcQzsQNVAZ93vbUtK4dIDtbDv80deDV3F4VvB6ie+JGw3jgTsAgAOP2/zfET8c17UCY h/gTHXd+nXtPhmaYASPhSqmY9LM3rBasyR8d0ZIBEvrOB1/AroROdr8A6Ya9VmlszrX5FTNEFn3 FiB6cd94xvXaUzFYY++rVdix3hbmOta9MFeFOxWpSzHBuX+Sx5gvG7Y3bg2qVy3S5tGV0IHFbPx PiVEMFwpM3btOwLEaP6SehuxvCfM0sain7wll48wgNIAn4ieuLjJ5Xv+CGkkLgkelU665YFwkPD NY= X-Google-Smtp-Source: AGHT+IFAY6FsHV3I9WPbISaGV1wLqBZ/XPu/1Ydb3y0EhUes/HrpQ4m7WNEmIXHmQDezrbkDlFI4Ig== X-Received: by 2002:a5d:5f92:0:b0:430:f6c0:6c5a with SMTP id ffacd0b85a97d-430f6c06ce4mr8796492f8f.22.1765876681942; Tue, 16 Dec 2025 01:18:01 -0800 (PST) Message-ID: <8b856e83-5da0-4e96-a4b3-0561becc57ca@suse.com> Date: Tue, 16 Dec 2025 10:18:01 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH v3 2/3] x86: move mem{cpy,set}.S to arch-specific library From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , =?UTF-8?Q?Roger_Pau_Monn=C3=A9?= References: Content-Language: en-US Autocrypt: addr=jbeulich@suse.com; keydata= xsDiBFk3nEQRBADAEaSw6zC/EJkiwGPXbWtPxl2xCdSoeepS07jW8UgcHNurfHvUzogEq5xk hu507c3BarVjyWCJOylMNR98Yd8VqD9UfmX0Hb8/BrA+Hl6/DB/eqGptrf4BSRwcZQM32aZK 7Pj2XbGWIUrZrd70x1eAP9QE3P79Y2oLrsCgbZJfEwCgvz9JjGmQqQkRiTVzlZVCJYcyGGsD /0tbFCzD2h20ahe8rC1gbb3K3qk+LpBtvjBu1RY9drYk0NymiGbJWZgab6t1jM7sk2vuf0Py O9Hf9XBmK0uE9IgMaiCpc32XV9oASz6UJebwkX+zF2jG5I1BfnO9g7KlotcA/v5ClMjgo6Gl MDY4HxoSRu3i1cqqSDtVlt+AOVBJBACrZcnHAUSuCXBPy0jOlBhxPqRWv6ND4c9PH1xjQ3NP nxJuMBS8rnNg22uyfAgmBKNLpLgAGVRMZGaGoJObGf72s6TeIqKJo/LtggAS9qAUiuKVnygo 3wjfkS9A3DRO+SpU7JqWdsveeIQyeyEJ/8PTowmSQLakF+3fote9ybzd880fSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPsJgBBMRAgAgBQJZN5xEAhsDBgsJCAcDAgQVAggDBBYC AwECHgECF4AACgkQoDSui/t3IH4J+wCfQ5jHdEjCRHj23O/5ttg9r9OIruwAn3103WUITZee e7Sbg12UgcQ5lv7SzsFNBFk3nEQQCACCuTjCjFOUdi5Nm244F+78kLghRcin/awv+IrTcIWF hUpSs1Y91iQQ7KItirz5uwCPlwejSJDQJLIS+QtJHaXDXeV6NI0Uef1hP20+y8qydDiVkv6l IreXjTb7DvksRgJNvCkWtYnlS3mYvQ9NzS9PhyALWbXnH6sIJd2O9lKS1Mrfq+y0IXCP10eS FFGg+Av3IQeFatkJAyju0PPthyTqxSI4lZYuJVPknzgaeuJv/2NccrPvmeDg6Coe7ZIeQ8Yj t0ARxu2xytAkkLCel1Lz1WLmwLstV30g80nkgZf/wr+/BXJW/oIvRlonUkxv+IbBM3dX2OV8 AmRv1ySWPTP7AAMFB/9PQK/VtlNUJvg8GXj9ootzrteGfVZVVT4XBJkfwBcpC/XcPzldjv+3 HYudvpdNK3lLujXeA5fLOH+Z/G9WBc5pFVSMocI71I8bT8lIAzreg0WvkWg5V2WZsUMlnDL9 mpwIGFhlbM3gfDMs7MPMu8YQRFVdUvtSpaAs8OFfGQ0ia3LGZcjA6Ik2+xcqscEJzNH+qh8V m5jjp28yZgaqTaRbg3M/+MTbMpicpZuqF4rnB0AQD12/3BNWDR6bmh+EkYSMcEIpQmBM51qM EKYTQGybRCjpnKHGOxG0rfFY1085mBDZCH5Kx0cl0HVJuQKC+dV2ZY5AqjcKwAxpE75MLFkr wkkEGBECAAkFAlk3nEQCGwwACgkQoDSui/t3IH7nnwCfcJWUDUFKdCsBH/E5d+0ZnMQi+G0A nAuWpQkjM1ASeQwSHEeAWPgskBQL In-Reply-To: Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1765876704808154100 Content-Type: text/plain; charset="utf-8" If not these, what else are library functions. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- v3: New. --- xen/arch/x86/Makefile | 2 -- xen/arch/x86/lib/Makefile | 2 ++ xen/arch/x86/{ =3D> lib}/memcpy.S | 0 xen/arch/x86/{ =3D> lib}/memset.S | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename xen/arch/x86/{ =3D> lib}/memcpy.S (100%) rename xen/arch/x86/{ =3D> lib}/memset.S (100%) diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index dfb258d7ac1c..43117c88e59d 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -48,8 +48,6 @@ obj-$(CONFIG_RETURN_THUNK) +=3D indirect-thunk.o obj-$(CONFIG_PV) +=3D ioport_emulate.o obj-y +=3D irq.o obj-$(CONFIG_KEXEC) +=3D machine_kexec.o -obj-y +=3D memcpy.o -obj-y +=3D memset.o obj-y +=3D mm.o x86_64/mm.o obj-$(CONFIG_VM_EVENT) +=3D monitor.o obj-y +=3D mpparse.o diff --git a/xen/arch/x86/lib/Makefile b/xen/arch/x86/lib/Makefile index 8fe2dfd88553..a5169f5e19c1 100644 --- a/xen/arch/x86/lib/Makefile +++ b/xen/arch/x86/lib/Makefile @@ -1,3 +1,5 @@ lib-y +=3D copy-guest.o lib-y +=3D copy-unsafe.o lib-y +=3D generic-hweightl.o +lib-y +=3D memcpy.o +lib-y +=3D memset.o diff --git a/xen/arch/x86/memcpy.S b/xen/arch/x86/lib/memcpy.S similarity index 100% rename from xen/arch/x86/memcpy.S rename to xen/arch/x86/lib/memcpy.S diff --git a/xen/arch/x86/memset.S b/xen/arch/x86/lib/memset.S similarity index 100% rename from xen/arch/x86/memset.S rename to xen/arch/x86/lib/memset.S From nobody Thu Dec 18 08:11:51 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1765876731; cv=none; d=zohomail.com; s=zohoarc; b=oJPOUqW67gpH3coy37AuqOysT3Ch3T7/pxdKwwcQjEZ8Zv/aOzscQ3KQHGoHv4089LuiFncJiSO6p2/qV5W+1FPvjVRt0RwNXsSRF/1yOr45zceWaw0x3WQsRkaZIx2v8S1fp7zWEhwaSW/kmmnXBL0Pupp+j4UqzoyC9VCeykg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765876731; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ANz5oLAgLPEi3G+5B2ZyA8WOqvy5xevNUG2OWEhCbwY=; b=mpRNaX1AF+7nwo3ld6wj8ot1VkHOh94JWZPUsQPAUwAOjLOeWvuGPvN9K6zMWgfKhvKlGvJIYZ6WkdZL3/EPzdlLlgulohf662xuNRKOwwkLg7M2du/V21v3l/eq9o3Jkv8wbPbtP/bp6z5tOnz+r6U2vZcDSy2fY2Nnp41mznY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1765876731694708.0847866675961; Tue, 16 Dec 2025 01:18:51 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1187749.1509084 (Exim 4.92) (envelope-from ) id 1vVRCV-0003tL-36; Tue, 16 Dec 2025 09:18:35 +0000 Received: by outflank-mailman (output) from mailman id 1187749.1509084; Tue, 16 Dec 2025 09:18:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vVRCV-0003tE-07; Tue, 16 Dec 2025 09:18:35 +0000 Received: by outflank-mailman (input) for mailman id 1187749; Tue, 16 Dec 2025 09:18:33 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vVRCT-0002x8-JZ for xen-devel@lists.xenproject.org; Tue, 16 Dec 2025 09:18:33 +0000 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [2a00:1450:4864:20::331]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 30a19a6c-da60-11f0-9cce-f158ae23cfc8; Tue, 16 Dec 2025 10:18:31 +0100 (CET) Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-4779cb0a33fso52498065e9.0 for ; Tue, 16 Dec 2025 01:18:31 -0800 (PST) Received: from [10.156.60.236] (ip-037-024-206-209.um08.pools.vodafone-ip.de. [37.24.206.209]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-430f268d459sm18845621f8f.32.2025.12.16.01.18.30 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 16 Dec 2025 01:18:30 -0800 (PST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 30a19a6c-da60-11f0-9cce-f158ae23cfc8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1765876711; x=1766481511; darn=lists.xenproject.org; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=ANz5oLAgLPEi3G+5B2ZyA8WOqvy5xevNUG2OWEhCbwY=; b=PPfvHidQJIoBmUeoAqBeZxEJiE/oxXNh/hSGi/t14kMPFSrdBS/vKpte/CVJJMgpon fEseWGHIVCHW9U0ERB4WhKyneJxLMiyzA0/m3qeCjTpJez2zE+iVh4T6C0M+0/LRCBVi iTLGYB94F/lzjws69BP49jKuPF0cX704v6DmE8TmuB86S9O08zYBezyQ4HbrU4tT6RMu mQiuf3T2jqJXjlV7HQuWY5z48zkVYK7PL3Z8L50bwmSTxGGWs3mKfyYdAhN8X2QWMEnW spUg3pmItvJM9g0e0pcKV/9aMtAvsfqS9Vxjf7PfRR5AYN5m0Yzf8ttb/PMbIyfU+J+F Reig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765876711; x=1766481511; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=ANz5oLAgLPEi3G+5B2ZyA8WOqvy5xevNUG2OWEhCbwY=; b=e73cEF25hpY8XoRrEGTqKv2MUD2U4ARTkhryPQSwOGmN3CNPNyBjpAeO1PkGt4LC+V 4tfb/D7lmwQkn4Ngt204W6FpIwacrCFwqVqPiaW2/TcP4r+pSGBUDIblTI7UNL1hqBCL o95tY/zx6lDbPrxZPpCt6hgKdlXL7sDyLpHwEeLFCjlZZbkDLOVioqhS4MMye2do+d9C bwao2Wm9xf09gYxF9MR27N5qjcWe7wIK8Cugido17RpsjGh9GvoLcEYQx3ARSOflc9oF OEwCKhHfs1Tm3f3Q3tKl/kFF/ZebQ1nqXY0QN40R5lR3Z5LBJ9H2RFrIO8kREUF6S7+y C23w== X-Gm-Message-State: AOJu0YxDyNXi5dryGLt1UVcqm89trx2loh7MMVYOJgAaXcuk1wVDTtkh dmrmbHV28ikzBDAEAV/GP/k+1z1i4VRW/pfSyU/94PecGSVuX0dQsCulXzVyZPQfEQUP1ptei4f 2pnM= X-Gm-Gg: AY/fxX7mo1bMmuKi0Px8RIhB/2eQ6E7fuDCkTyRWPYtVRJ9n3dDEGFFxub91wWJRdE8 wSmSHiEPODzDfAYJBrXSs4gVEaJ0zUI1j9rgGgZGBF/VLrCA02NwI61lVTP7nq5ESwAV/qFmBO2 bv4vAbN1AJu7ENzP7hlWWJwZ9+U162boYCgvu9zOHEQV9QyyCmAZUuR+1qRNOVuLA60z6Rk+xyc rOIWEW0SyXsI/4aBh7SxOj1OT+lAiSCeoTM0WkB9ZxtuLesAu2gq+1fx0CQhDy1Vi3c9Vr0MAST HsOqFMFJCsv3zeaYRo4ZyAV8rMjP9XtOHbpXTKExhWgkG8meDyLSvg5zDPZ/saVytQuPEkri1wg IItJcP1G/v0mkYbOKQpUAAeHXCkA+99ReYNFUsn6kSOpe75TGTLcaWkDV86fC4xZ0KVn6XNhSA8 5zdgxBssn2Zqn4yLvpTt/toxr9GXo2zYMeZA/mcMmRQIm3iIkhTT26WoVtFTvBZiXVqhH15Iv58 RqQceLj2MMRrw== X-Google-Smtp-Source: AGHT+IFWoWq4Un9AFPJHFLLN+PMuHGfqC0Of2ZBbcCiWWbTfmMIxvPsUEbP9C7XLINEzD6HPIVC/TA== X-Received: by 2002:a05:600c:45c9:b0:46e:35a0:3587 with SMTP id 5b1f17b1804b1-47a8f90c516mr143378485e9.27.1765876711194; Tue, 16 Dec 2025 01:18:31 -0800 (PST) Message-ID: <2c224d52-6f3f-4fa9-abd5-dc7ea13b3402@suse.com> Date: Tue, 16 Dec 2025 10:18:30 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH v3 3/3] x86: move {clear_,copy_,scrub-}page.S to arch-specific library From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , =?UTF-8?Q?Roger_Pau_Monn=C3=A9?= References: Content-Language: en-US Autocrypt: addr=jbeulich@suse.com; keydata= xsDiBFk3nEQRBADAEaSw6zC/EJkiwGPXbWtPxl2xCdSoeepS07jW8UgcHNurfHvUzogEq5xk hu507c3BarVjyWCJOylMNR98Yd8VqD9UfmX0Hb8/BrA+Hl6/DB/eqGptrf4BSRwcZQM32aZK 7Pj2XbGWIUrZrd70x1eAP9QE3P79Y2oLrsCgbZJfEwCgvz9JjGmQqQkRiTVzlZVCJYcyGGsD /0tbFCzD2h20ahe8rC1gbb3K3qk+LpBtvjBu1RY9drYk0NymiGbJWZgab6t1jM7sk2vuf0Py O9Hf9XBmK0uE9IgMaiCpc32XV9oASz6UJebwkX+zF2jG5I1BfnO9g7KlotcA/v5ClMjgo6Gl MDY4HxoSRu3i1cqqSDtVlt+AOVBJBACrZcnHAUSuCXBPy0jOlBhxPqRWv6ND4c9PH1xjQ3NP nxJuMBS8rnNg22uyfAgmBKNLpLgAGVRMZGaGoJObGf72s6TeIqKJo/LtggAS9qAUiuKVnygo 3wjfkS9A3DRO+SpU7JqWdsveeIQyeyEJ/8PTowmSQLakF+3fote9ybzd880fSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPsJgBBMRAgAgBQJZN5xEAhsDBgsJCAcDAgQVAggDBBYC AwECHgECF4AACgkQoDSui/t3IH4J+wCfQ5jHdEjCRHj23O/5ttg9r9OIruwAn3103WUITZee e7Sbg12UgcQ5lv7SzsFNBFk3nEQQCACCuTjCjFOUdi5Nm244F+78kLghRcin/awv+IrTcIWF hUpSs1Y91iQQ7KItirz5uwCPlwejSJDQJLIS+QtJHaXDXeV6NI0Uef1hP20+y8qydDiVkv6l IreXjTb7DvksRgJNvCkWtYnlS3mYvQ9NzS9PhyALWbXnH6sIJd2O9lKS1Mrfq+y0IXCP10eS FFGg+Av3IQeFatkJAyju0PPthyTqxSI4lZYuJVPknzgaeuJv/2NccrPvmeDg6Coe7ZIeQ8Yj t0ARxu2xytAkkLCel1Lz1WLmwLstV30g80nkgZf/wr+/BXJW/oIvRlonUkxv+IbBM3dX2OV8 AmRv1ySWPTP7AAMFB/9PQK/VtlNUJvg8GXj9ootzrteGfVZVVT4XBJkfwBcpC/XcPzldjv+3 HYudvpdNK3lLujXeA5fLOH+Z/G9WBc5pFVSMocI71I8bT8lIAzreg0WvkWg5V2WZsUMlnDL9 mpwIGFhlbM3gfDMs7MPMu8YQRFVdUvtSpaAs8OFfGQ0ia3LGZcjA6Ik2+xcqscEJzNH+qh8V m5jjp28yZgaqTaRbg3M/+MTbMpicpZuqF4rnB0AQD12/3BNWDR6bmh+EkYSMcEIpQmBM51qM EKYTQGybRCjpnKHGOxG0rfFY1085mBDZCH5Kx0cl0HVJuQKC+dV2ZY5AqjcKwAxpE75MLFkr wkkEGBECAAkFAlk3nEQCGwwACgkQoDSui/t3IH7nnwCfcJWUDUFKdCsBH/E5d+0ZnMQi+G0A nAuWpQkjM1ASeQwSHEeAWPgskBQL In-Reply-To: Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1765876733139154100 Content-Type: text/plain; charset="utf-8" These are pretty similar to the standard library memset() / memcpy(). Switch to building scrub-page.S unconditionally; the linker will simply not pick it up when not needed. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- v3: New. --- While moving I noticed that the files here have .file at the top, while mem{cpy,set}.S don't. There not being any static symbols, likely we could omit the directives here, too? Or should mem{cpy,set}.S gain them? --- xen/arch/x86/Makefile | 3 --- xen/arch/x86/lib/Makefile | 3 +++ xen/arch/x86/{clear_page.S =3D> lib/clear-page.S} | 0 xen/arch/x86/{copy_page.S =3D> lib/copy-page.S} | 0 xen/arch/x86/{ =3D> lib}/scrub-page.S | 0 5 files changed, 3 insertions(+), 3 deletions(-) rename xen/arch/x86/{clear_page.S =3D> lib/clear-page.S} (100%) rename xen/arch/x86/{copy_page.S =3D> lib/copy-page.S} (100%) rename xen/arch/x86/{ =3D> lib}/scrub-page.S (100%) diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 43117c88e59d..1fc651146f10 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -17,8 +17,6 @@ obj-y +=3D apic.o obj-y +=3D bhb-thunk.o obj-y +=3D bitops.o obj-bin-y +=3D bzimage.init.o -obj-bin-y +=3D clear_page.o -obj-bin-y +=3D copy_page.o obj-y +=3D cpu-policy.o obj-y +=3D cpuid.o obj-$(CONFIG_PV) +=3D compat.o @@ -57,7 +55,6 @@ obj-y +=3D pci.o obj-y +=3D physdev.o obj-$(CONFIG_COMPAT) +=3D x86_64/physdev.o obj-$(CONFIG_X86_PSR) +=3D psr.o -obj-bin-$(CONFIG_DEBUG) +=3D scrub-page.o obj-y +=3D setup.o obj-y +=3D shutdown.o obj-y +=3D smp.o diff --git a/xen/arch/x86/lib/Makefile b/xen/arch/x86/lib/Makefile index a5169f5e19c1..b9a65c662a56 100644 --- a/xen/arch/x86/lib/Makefile +++ b/xen/arch/x86/lib/Makefile @@ -1,5 +1,8 @@ +lib-y +=3D clear-page.o lib-y +=3D copy-guest.o +lib-y +=3D copy-page.o lib-y +=3D copy-unsafe.o lib-y +=3D generic-hweightl.o lib-y +=3D memcpy.o lib-y +=3D memset.o +lib-y +=3D scrub-page.o diff --git a/xen/arch/x86/clear_page.S b/xen/arch/x86/lib/clear-page.S similarity index 100% rename from xen/arch/x86/clear_page.S rename to xen/arch/x86/lib/clear-page.S diff --git a/xen/arch/x86/copy_page.S b/xen/arch/x86/lib/copy-page.S similarity index 100% rename from xen/arch/x86/copy_page.S rename to xen/arch/x86/lib/copy-page.S diff --git a/xen/arch/x86/scrub-page.S b/xen/arch/x86/lib/scrub-page.S similarity index 100% rename from xen/arch/x86/scrub-page.S rename to xen/arch/x86/lib/scrub-page.S