From patchwork Fri Mar 14 17:24:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alejandro Vallejo X-Patchwork-Id: 14017188 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7B1F0C35FF3 for ; Fri, 14 Mar 2025 17:25:49 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.914866.1320489 (Exim 4.92) (envelope-from ) id 1tt8mt-0003Wj-Tu; Fri, 14 Mar 2025 17:25:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 914866.1320489; Fri, 14 Mar 2025 17:25: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 1tt8mt-0003Wc-QU; Fri, 14 Mar 2025 17:25:35 +0000 Received: by outflank-mailman (input) for mailman id 914866; Fri, 14 Mar 2025 17:25:35 +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 1tt8mt-0003WI-Dg for xen-devel@lists.xenproject.org; Fri, 14 Mar 2025 17:25:35 +0000 Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [2a00:1450:4864:20::62a]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 55cd188f-00f9-11f0-9899-31a8f345e629; Fri, 14 Mar 2025 18:25:33 +0100 (CET) Received: by mail-ej1-x62a.google.com with SMTP id a640c23a62f3a-aaecf50578eso411397566b.2 for ; Fri, 14 Mar 2025 10:25:33 -0700 (PDT) Received: from localhost.localdomain ([66.81.170.107]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac3146aeb24sm250677566b.9.2025.03.14.10.25.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 10:25:32 -0700 (PDT) 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: 55cd188f-00f9-11f0-9899-31a8f345e629 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloud.com; s=cloud; t=1741973133; x=1742577933; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=D88teVB8QraJI8UkkRbNWyapnCrKK4Sforaz0HF/IhM=; b=YtkYHTz0O6kd9sAc0a9JIH8KckLarfRGMhY/Y55TRx4qTe90cFyYWE2xkr7peYMRc1 bRTjhfA0nN0hHdaxCtwj5qD16JgUh5PtOH7ZQeD9IxsEZ4Qxkqie3c0icL0Vs/Jz3huV hW/rl8vovw04rxiODzVOUaVhAs1lUnk9sGnz4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741973133; x=1742577933; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=D88teVB8QraJI8UkkRbNWyapnCrKK4Sforaz0HF/IhM=; b=SPvsDOcYrCAVbo9PAhvNxuuT5aoqNwiroBHgNGe0IjIJDCeN9wUYbseN3IcylPrYxr EkEQ0VR3bgGjLmYELhLaMLHkNkmn08f/Tmu5C+ZYAqFdpGPcDtNO/xN8gQyxgy2zfJHS W6cZbtLQcgY7+7PcxmY72fv74AJuIF0+gwUKFms8HYp1JiErJoET7OJRd9W33LXGM/tN YnPU/tfWU+VuKc6Dv68kQnKpU1bupNib0dvAQ6lAT1iz5O0na8TBSpvmOMS97lbqvrNJ KTk0u/45iNvf//akYus6ArjH6WOqX3eNqu30UPX1EWsjWfZneSdzGw3dPT3ChjBLmt+4 O9HA== X-Gm-Message-State: AOJu0YyGPJLO0lv8XfF8+D5FGyyreDRTjMVguLaIoBRSWxbdWaMlcAyX kdbZiqoRso8vpaQg568xvLZydk4olbhuhjzoA6nd5Eu2VVzZUKt45NTvCnZmrNVxcd4YF+//Jaj e X-Gm-Gg: ASbGncueeobaSPZsU9seKso+cHGaQ4N5QnD6ibLrsvunG7YnLW8XQ4O5KfzSZAUXcAJ cSBSsN9KsW9P3c7/hDT1c902n/v6KZp551rSJRtaErCE2ObsL8PwEqapQsYHrT4KJeVQDMdVOBV bSKreJwHlFZBbfJGiYew5spV3ag9G+7J6C0aP08uueEor1h2mtE693g9le5E+bv3UJ9uv6OvXPZ 3sMdxGrlHx9uTE2Qlliz0lk3QX2qnQ0hNAaSw/QxJLXoIE56UEFiWofwWIldjSSF51ZzItbANh+ n5DxJIDT83XvWBuXSw/E38c4pvRNFI+Ek4ixqAzujoLxGgxV5VZJQlM5e8+/lh1vCkk= X-Google-Smtp-Source: AGHT+IHF+okTXpoKk3F3RN6+H/q9LDUWzo3CUgJjnS2eIVHjtz6xVjONzkwXnSSZJAQyrsQrJwTsJA== X-Received: by 2002:a17:907:9485:b0:ac3:2a77:cb4e with SMTP id a640c23a62f3a-ac330189240mr367576266b.13.1741973132888; Fri, 14 Mar 2025 10:25:32 -0700 (PDT) From: Alejandro Vallejo To: xen-devel@lists.xenproject.org Cc: Alejandro Vallejo , Bernhard Kaindl , Andrew Cooper , Anthony PERARD , Michal Orzel , Jan Beulich , Julien Grall , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Stefano Stabellini Subject: [PATCH 01/11] xen/memory: Mask XENMEMF_node() to 8 bits Date: Fri, 14 Mar 2025 17:24:52 +0000 Message-ID: <20250314172502.53498-2-alejandro.vallejo@cloud.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250314172502.53498-1-alejandro.vallejo@cloud.com> References: <20250314172502.53498-1-alejandro.vallejo@cloud.com> MIME-Version: 1.0 As it is, it's incredibly easy for a buggy call to XENMEMF_node() to unintentionally overflow into bit 17 and beyond. Prevent it by masking, just like MEMF_* does. While at it, turn "x" into "n" and "f" to better indicate whether the macro takes nodes or mem_flags (just like their MEMF_* counterparts). Signed-off-by: Alejandro Vallejo --- xen/include/public/memory.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/include/public/memory.h b/xen/include/public/memory.h index bd9fc37b5297..077eef48c60d 100644 --- a/xen/include/public/memory.h +++ b/xen/include/public/memory.h @@ -32,8 +32,9 @@ #define XENMEMF_address_bits(x) (x) #define XENMEMF_get_address_bits(x) ((x) & 0xffu) /* NUMA node to allocate from. */ -#define XENMEMF_node(x) (((x) + 1) << 8) -#define XENMEMF_get_node(x) ((((x) >> 8) - 1) & 0xffu) +#define XENMEMF_node_mask (0xffu) +#define XENMEMF_node(n) ((((n) + 1) & XENMEMF_node_mask) << 8) +#define XENMEMF_get_node(f) ((((f) >> 8) - 1) & XENMEMF_node_mask) /* Flag to populate physmap with populate-on-demand entries */ #define XENMEMF_populate_on_demand (1<<16) /* Flag to request allocation only from the node specified */