From patchwork Tue Feb 4 13:02:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 13959156 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 350A6C02194 for ; Tue, 4 Feb 2025 13:02:16 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.881396.1291530 (Exim 4.92) (envelope-from ) id 1tfIZ7-0004Ih-84; Tue, 04 Feb 2025 13:02:09 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 881396.1291530; Tue, 04 Feb 2025 13:02:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tfIZ7-0004Ia-58; Tue, 04 Feb 2025 13:02:09 +0000 Received: by outflank-mailman (input) for mailman id 881396; Tue, 04 Feb 2025 13:02:07 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tfIZ5-0003om-0q for xen-devel@lists.xenproject.org; Tue, 04 Feb 2025 13:02:07 +0000 Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [2a00:1450:4864:20::62f]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 3c24453b-e2f8-11ef-a0e7-8be0dac302b0; Tue, 04 Feb 2025 14:02:06 +0100 (CET) Received: by mail-ej1-x62f.google.com with SMTP id a640c23a62f3a-aaf3c3c104fso1075801966b.1 for ; Tue, 04 Feb 2025 05:02:06 -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 4fb4d7f45d1cf-5dc723d0043sm9405388a12.12.2025.02.04.05.02.04 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 04 Feb 2025 05:02:04 -0800 (PST) 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: 3c24453b-e2f8-11ef-a0e7-8be0dac302b0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1738674126; x=1739278926; 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=6RvyDtGk9uukOr9PtLB087jXoCbv9C88nLmliW6XJIE=; b=cP+k2bqn9P+G0zBJlmjkYKm/73zPD7ZnffDdPxjcx6JnPsUjMABsJ2Tss5w7/TKcOV o0FUjqbTXYD4Z1lo0O11Nz1wy/W0Ss9ljT79A0RiCOuqvaAcLEAOBOddRPGDfkauQ1II OVQtfAc1yI5bDxTetdUcWI9Iiy7swkRVScfIQTKWGq05q9W+3WIj27L5afZp2ta6T99y rMpmqnbrDLkAP5Dp+T1TG1UNmK/LDy33EdrqeP83d/dwMhEN59fYRkU3VwTIfZPYFHwf EC9d82It+L+hpEGvkw5XWy52UzRsHaKAuX/JOCzPjUlzUGu5n+8Xw+KIxU60eiOf+RbC sXYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738674126; x=1739278926; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=6RvyDtGk9uukOr9PtLB087jXoCbv9C88nLmliW6XJIE=; b=RJftdZjA1nMePTPwDZywd4pJubQDVQP9jvSpbSW8zNwBxeumwDri2wLkMtwtyLFLAI 3lGo5TkJjXnm05O7xGKm7bwJIjFNHAlSAMbAL6xz6AcsIQNktZblnlmzwdgkMKSCUfGK uQVglVo3hsG22qkmBbRmLIpkIlc7DPBDQYjj0H4QBL0qbHWBSW3Gutun6HNcHo0Ahn8y IEWHV4i396g1fC1ahjBlanfn7hiCyv0ZtNU11RoQnGYqVSg/K62OSfg48Vp3ESO/NwUS 6aIYJ57ATMJ8UEl/9l8i/B85oK0DnyxuUnD4iRd6PFRew/1qYC/fHCUAewE3SJIwvAX2 8Sig== X-Gm-Message-State: AOJu0YywNz5BD6wquWe6+/p0yiwKOF4UoSLz3AOu3mCPLL+JPAoT64op MxSn394zfXBA8lYXhL7NKduKYIFFBS63Hen6BYyAxnFEa+sDfwrgeoCf7zZLyFNov6n9QCjrlds = X-Gm-Gg: ASbGncsntYBkyR7cH/vjP6RYwebMurxpzay1G94VLbMg8shmVd7K7jXIx4oTfCNoma/ T0p+czV599YMzOQdWfk/X0dazF2tTFTK66NQEeuo4LX669EZXfR5EdNvO8AwWrxjgsHgAE1S4Mn tZnhnMP9/5GFx7o9G8yAVY5MDQPkjKg5T4aydjtycRXJy4GyCts/YRwYMD5aXn8HwaiZRwk8Rcv 33OwN6g+IEMAq0wi8k9Yb4NsfgS3Alkd9L0Myvd9FUE4uRLyzSO4YjQ/9eB2DGbkam0l5kIO81q fMqrhLn5AU1BLuCIYLAl2L6OMfjCHTvwqgNoiPbcDVSy4NBRLpu/Z9RsNJ4BiMs1rQHDIuVHqze b X-Google-Smtp-Source: AGHT+IEhyOjIZCmOVA0k4fvkoQ+zp2QBu39ctZljJnxK8dGWOYij0JtJy6HvfIm9V+d0WyyEGhD6mg== X-Received: by 2002:a17:907:3d8f:b0:ab7:8e7:7df8 with SMTP id a640c23a62f3a-ab708e78014mr1884922966b.22.1738674125160; Tue, 04 Feb 2025 05:02:05 -0800 (PST) Message-ID: Date: Tue, 4 Feb 2025 14:02:03 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH v3 for-4.20 1/4] radix-tree: purge node allocation override hooks From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Oleksii Kurochko , Andrew Cooper , Julien Grall , Stefano Stabellini , Anthony PERARD , Michal Orzel , =?utf-8?q?Roger_Pau_Monn=C3=A9?= References: <0a006732-2b6e-46f0-a706-f432abd45d2c@suse.com> 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: <0a006732-2b6e-46f0-a706-f432abd45d2c@suse.com> These were needed by TMEM only, which is long gone. The Linux original doesn't have such either. This effectively reverts one of the "Other changes" from 8dc6738dbb3c ("Update radix-tree.[ch] from upstream Linux to gain RCU awareness"). Positive side effect: Two cf_check go away. While there also convert xmalloc()+memset() to xzalloc(). (Don't convert to xvzalloc(), as that would require touching the freeing side, too.) Requested-by: Andrew Cooper Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- v3: Add a missing blank line. v2: New. --- a/xen/common/radix-tree.c +++ b/xen/common/radix-tree.c @@ -53,12 +53,6 @@ struct rcu_node { struct rcu_head rcu_head; }; -static struct radix_tree_node *cf_check rcu_node_alloc(void *arg) -{ - struct rcu_node *rcu_node = xmalloc(struct rcu_node); - return rcu_node ? &rcu_node->node : NULL; -} - static void cf_check _rcu_node_free(struct rcu_head *head) { struct rcu_node *rcu_node = @@ -66,26 +60,20 @@ static void cf_check _rcu_node_free(stru xfree(rcu_node); } -static void cf_check rcu_node_free(struct radix_tree_node *node, void *arg) -{ - struct rcu_node *rcu_node = container_of(node, struct rcu_node, node); - call_rcu(&rcu_node->rcu_head, _rcu_node_free); -} - static struct radix_tree_node *radix_tree_node_alloc( struct radix_tree_root *root) { - struct radix_tree_node *ret; - ret = root->node_alloc(root->node_alloc_free_arg); - if (ret) - memset(ret, 0, sizeof(*ret)); - return ret; + struct rcu_node *rcu_node = xzalloc(struct rcu_node); + + return rcu_node ? &rcu_node->node : NULL; } static void radix_tree_node_free( struct radix_tree_root *root, struct radix_tree_node *node) { - root->node_free(node, root->node_alloc_free_arg); + struct rcu_node *rcu_node = container_of(node, struct rcu_node, node); + + call_rcu(&rcu_node->rcu_head, _rcu_node_free); } /* @@ -718,19 +706,6 @@ void radix_tree_destroy( void radix_tree_init(struct radix_tree_root *root) { memset(root, 0, sizeof(*root)); - root->node_alloc = rcu_node_alloc; - root->node_free = rcu_node_free; -} - -void radix_tree_set_alloc_callbacks( - struct radix_tree_root *root, - radix_tree_alloc_fn_t *node_alloc, - radix_tree_free_fn_t *node_free, - void *node_alloc_free_arg) -{ - root->node_alloc = node_alloc; - root->node_free = node_free; - root->node_alloc_free_arg = node_alloc_free_arg; } static __init unsigned long __maxindex(unsigned int height) --- a/xen/include/xen/radix-tree.h +++ b/xen/include/xen/radix-tree.h @@ -66,11 +66,6 @@ typedef void radix_tree_free_fn_t(struct struct radix_tree_root { unsigned int height; struct radix_tree_node __rcu *rnode; - - /* Allow to specify custom node alloc/dealloc routines. */ - radix_tree_alloc_fn_t *node_alloc; - radix_tree_free_fn_t *node_free; - void *node_alloc_free_arg; }; /* @@ -78,11 +73,6 @@ struct radix_tree_root { */ void radix_tree_init(struct radix_tree_root *root); -void radix_tree_set_alloc_callbacks( - struct radix_tree_root *root, - radix_tree_alloc_fn_t *node_alloc, - radix_tree_free_fn_t *node_free, - void *node_alloc_free_arg); void radix_tree_destroy( struct radix_tree_root *root, From patchwork Tue Feb 4 13:03:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 13959157 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 44D92C02194 for ; Tue, 4 Feb 2025 13:03:24 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.881403.1291540 (Exim 4.92) (envelope-from ) id 1tfIaA-0004pj-HM; Tue, 04 Feb 2025 13:03:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 881403.1291540; Tue, 04 Feb 2025 13:03:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tfIaA-0004pc-Eb; Tue, 04 Feb 2025 13:03:14 +0000 Received: by outflank-mailman (input) for mailman id 881403; Tue, 04 Feb 2025 13:03:13 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tfIa9-0004pU-84 for xen-devel@lists.xenproject.org; Tue, 04 Feb 2025 13:03:13 +0000 Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [2a00:1450:4864:20::530]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 63a55c80-e2f8-11ef-a0e7-8be0dac302b0; Tue, 04 Feb 2025 14:03:12 +0100 (CET) Received: by mail-ed1-x530.google.com with SMTP id 4fb4d7f45d1cf-5d932eac638so9961580a12.1 for ; Tue, 04 Feb 2025 05:03:12 -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 a640c23a62f3a-ab7010f4d2asm715173466b.75.2025.02.04.05.03.11 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 04 Feb 2025 05:03:11 -0800 (PST) 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: 63a55c80-e2f8-11ef-a0e7-8be0dac302b0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1738674192; x=1739278992; 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=DuLRsZHSFXvpAVO+A+d8XnA2F4BzksUCwYQK44B03Xw=; b=ZvZGu+fAFOmkEUTSmGWqopxOre39GZrdV7WnUw4KQdhkaMpOUjI2nLnlHA/+WXIUDq P5avcyB3rzyVYKRKN0V9d7Si5ksMCiWpt2UyePiICmBw4XfQPVD7U0fkVbBaLNOA3CjK wXOIYUG4iMff1xffS45OEwa/9vtGmUZaqvN/axGH9yhUFvq6WdnkyQa1qBGZxnlwWHAC Fx2Fp59RhGpbqOCcFqDWVFLKtxFBLRCq5tm2VL3S+61r+aktteRJWlyYO2Xpp+dDbbQp TYDcPsjFqUcj4IRZa9t6SyfjC2H+2uTpplBiz+wtIFghfdvivX84sdfohbHPyMrktwUv yYXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738674192; x=1739278992; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=DuLRsZHSFXvpAVO+A+d8XnA2F4BzksUCwYQK44B03Xw=; b=qmLSe47Clxwe4JmHpTC5qK+rLIZmfQMdim7basTOJSTcEFRGj/6brHn03y4GfCFPRH hJ8hC90MMQiJeq9E7lIULSFc4e6hLs0b+LilBomu+CusAD60vT0MNLgUTfhwRxM38fpF y6WG9tr3P1tfCD2xVsay26OB/Jio8NvWJJzHBQE17LpCRIhqIePewNOKCaD1o6aGQJPW O9/CHEaVU+ASqyQxUikhqG4+yNRAN4vLngF8CyiUZfPp5AqzeFD9Ecr3ywVuvprFpnqC DnZrkK3VM1v8iqGEuHwgVBttC+1vrlACKRAUnPzSFpKG0g79tuPq6GrfWkdv8gf6PJxW LK6g== X-Gm-Message-State: AOJu0Yzfh8JnTj/b9eHL29h+Eh5jfwaiqeiL7cVaud5nbBiy4aDo5Wwr w1aYxPIUWZo67NsvKvcv+Co6YmVNuxHhL8wDCiYFSEwW6Q345yFlDg1MP/W96Edq1Dg0ly7npy0 = X-Gm-Gg: ASbGncvf9s4XXwQEXFGB0aOe0n+FL7It4SYlwKT3rY7We63QeDtvWNaDZ17EMPSPimy igBN3EUFJDzmkYTsq2tkOnbEjlKSAS6Bgaljt3u2lQlnupow/ub50iHKaaI96hpVs3RyQ3ris+n tC/udSDG6k5GJaZG3qI+DO9klV2tpdJh5JLaqeGlmM0B/Y9qGm5kLYPaoqp0WmKpwXXaP7pMnQN E5/yA0dR5VoNTqRQnzIet4zAoAXNoH/JUwXKpQ82/kCipf8zsppVtuwWNbxm0/WVoLEau6RIjns YjLagkQaj+SmRaVEVX4j7Q2a4PLl1ocmpnG5fz00vM8V4g5Pg37n3M5Biby716pnDSS8K5lJnnN 2 X-Google-Smtp-Source: AGHT+IHMmASDxj9NeTpR1Uo77Fcxz0fXX3T1OvbTMqI5td72kbZ6cfHP51DzCcBmJ4zcOseQK5wSuA== X-Received: by 2002:a17:907:7fa6:b0:ab6:b848:2ab with SMTP id a640c23a62f3a-ab6cfcdf2a3mr2659089466b.16.1738674191635; Tue, 04 Feb 2025 05:03:11 -0800 (PST) Message-ID: Date: Tue, 4 Feb 2025 14:03:10 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH v3 for-4.20 2/4] radix-tree: introduce RADIX_TREE{,_INIT}() From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , =?utf-8?q?Roger_Pau_Monn?= =?utf-8?q?=C3=A9?= , Oleksii Kurochko References: <0a006732-2b6e-46f0-a706-f432abd45d2c@suse.com> 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: <0a006732-2b6e-46f0-a706-f432abd45d2c@suse.com> ... now that static initialization is possible. Use RADIX_TREE() for pci_segments and ivrs_maps. This then fixes an ordering issue on x86: With the call to radix_tree_init(), acpi_mmcfg_init()'s invocation of pci_segments_init() will zap the possible earlier introduction of segment 0 by amd_iommu_detect_one_acpi()'s call to pci_ro_device(), and thus the write-protection of the PCI devices representing AMD IOMMUs. Fixes: 3950f2485bbc ("x86/x2APIC: defer probe until after IOMMU ACPI table parsing") Requested-by: Andrew Cooper Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- Sadly gcc below 5.x doesn't support compound literals in static initializers (Clang 3.5 does). Hence the request in response to v2 has to remain un-addressed. --- v3: Extend description and add Fixes: tag. v2: New. --- a/xen/drivers/passthrough/amd/iommu_init.c +++ b/xen/drivers/passthrough/amd/iommu_init.c @@ -31,7 +31,7 @@ static struct tasklet amd_iommu_irq_task unsigned int __read_mostly amd_iommu_acpi_info; unsigned int __read_mostly ivrs_bdf_entries; u8 __read_mostly ivhd_type; -static struct radix_tree_root ivrs_maps; +static RADIX_TREE(ivrs_maps); LIST_HEAD_RO_AFTER_INIT(amd_iommu_head); bool iommuv2_enabled; @@ -1408,7 +1408,6 @@ int __init amd_iommu_prepare(bool xt) goto error_out; ivrs_bdf_entries = rc; - radix_tree_init(&ivrs_maps); for_each_amd_iommu ( iommu ) { rc = amd_iommu_prepare_one(iommu); --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -68,7 +68,7 @@ bool pcidevs_locked(void) return rspin_is_locked(&_pcidevs_lock); } -static struct radix_tree_root pci_segments; +static RADIX_TREE(pci_segments); static inline struct pci_seg *get_pseg(u16 seg) { @@ -124,7 +124,6 @@ static int pci_segments_iterate( void __init pci_segments_init(void) { - radix_tree_init(&pci_segments); if ( !alloc_pseg(0) ) panic("Could not initialize PCI segment 0\n"); } --- a/xen/include/xen/radix-tree.h +++ b/xen/include/xen/radix-tree.h @@ -72,6 +72,9 @@ struct radix_tree_root { *** radix-tree API starts here ** */ +#define RADIX_TREE_INIT() {} +#define RADIX_TREE(name) struct radix_tree_root name = RADIX_TREE_INIT() + void radix_tree_init(struct radix_tree_root *root); void radix_tree_destroy( From patchwork Tue Feb 4 13:03:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 13959158 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 54300C02196 for ; Tue, 4 Feb 2025 13:03:41 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.881406.1291549 (Exim 4.92) (envelope-from ) id 1tfIaU-0005Cv-PA; Tue, 04 Feb 2025 13:03:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 881406.1291549; Tue, 04 Feb 2025 13:03:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tfIaU-0005Co-M7; Tue, 04 Feb 2025 13:03:34 +0000 Received: by outflank-mailman (input) for mailman id 881406; Tue, 04 Feb 2025 13:03:33 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tfIaT-0004pU-S5 for xen-devel@lists.xenproject.org; Tue, 04 Feb 2025 13:03:33 +0000 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [2a00:1450:4864:20::629]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 70190486-e2f8-11ef-a0e7-8be0dac302b0; Tue, 04 Feb 2025 14:03:33 +0100 (CET) Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-aaeef97ff02so878250066b.1 for ; Tue, 04 Feb 2025 05:03:33 -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 a640c23a62f3a-ab6e47d06casm931006266b.58.2025.02.04.05.03.32 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 04 Feb 2025 05:03:32 -0800 (PST) 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: 70190486-e2f8-11ef-a0e7-8be0dac302b0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1738674213; x=1739279013; 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=YA3OQxws77HgJGP3CurYrOn0Nh0s0d0+YcaOV1dj20Y=; b=UhTYoUnxwyi7NwOOHh9SnTCdSNveqaMe0f9vrAEZbLMBop9V/FQloAe4ab9tpDl+dc g6JXaXXqfR4b+6HLL52AZqH79Yi8eVsP39FCgiVm3/Js6bMHzNo2Hx0AalrGzk3Dt954 828K4nWgo0Fo++Zn1g+RWLxGHbGD+D7b+kU/IW1LlqtsQIpcrTyb2aMKMA5vLg3+xTF/ U/jQ4fEzU5uj//q8g6qs5G2IMboIUKpL/vzEfwsmZfSmv6mBqJk/efh+L97dLy747ztV eA6x1BPs8CR2+yF1DVFCAMPpU7WpygCeuIR+ju61W4sUGVnhr3B8UHodYJj4sLQ8S8CA p2Fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738674213; x=1739279013; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=YA3OQxws77HgJGP3CurYrOn0Nh0s0d0+YcaOV1dj20Y=; b=uGa3EBXP9dX+mysL0hRauggDSEDV+Su5bp4UdtodUrsly/dZxCp5yti71qrlIIfWW6 E9GfyiKv1qaf4YskQ8pD9m71TGRtzyTfNm6vlO4tpDIhUmwTcvGtcSm7xbmLLkpVBACE J5vF2BYUnoMMTKjmHyN2WwPLR/BodN0+6Gbj/j0JTg2GqAYQAphAadhu+xuhdXDUyqb9 VebHbKz9qr49rc5ZnZeWXrtp0sppIpPSbpSROa8bGFbvtUjh6ooWCAGJvvikRLfOl6Q8 32LjoUslh4rroVqOSMYvmiQrQU/X3AY45iEOOqg29KjLl8Dz/8NrGGCVuIi7bf86Ocxj gqHA== X-Gm-Message-State: AOJu0YxzYheV5VzO1oZY0hS+N+ReMQ8s/fvlqrCHEpkeJt7A2DsQ7MUx LhgnkfbFtlDVPKpsIV0DaWKOFORDbi6OhsvVmZUpDkl+Z4ibJnWQhhp1/7QuWp1mMf1n8vevqeg = X-Gm-Gg: ASbGnctt6zF1N9L+38BfmIUS2s5CBcxEmoYwZFJFKynGMEDr7tb+s3C1NP7EpQBZQO5 PucKORrc+0WD4QuZ/I5XkIRGr97kwsraNOEkiQcdmlybsMM68MuAph/CcmIJbFICBmvBMj0yq8u yny0TBYhmsrushGhn6LuSEzwJBAZVB7RZEmoeTmQnqcyjWfNOQBfkep51BT5urzGgSyVtLkNSa8 sRMHpfpZFCDIZRbRq567TP2BqahzCR/8L+y4BQEC6DOx/JO7g7TKwafOi3oVeQio5n+PZdmBor3 ct4wN50zGunuFb6sgxYQAnefDroUzEzzDhPEfidbOnolTQ1pnwbfiMVwrkSo7BeDk1Np3kfOoV9 q X-Google-Smtp-Source: AGHT+IGIeQkGB76i3FAhXpPuqPMz2fqz8HAEA+arwy19owpboW918xPuobVxq8yyBVJLKykqxDmJIA== X-Received: by 2002:a17:907:7f90:b0:ab2:c1da:b725 with SMTP id a640c23a62f3a-ab6cfd07cb1mr3104813066b.30.1738674212543; Tue, 04 Feb 2025 05:03:32 -0800 (PST) Message-ID: Date: Tue, 4 Feb 2025 14:03:31 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH v3 for-4.21 3/4] radix-tree: drop "root" parameters from radix_tree_node_{alloc,free}() From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , =?utf-8?q?Roger_Pau_Monn?= =?utf-8?q?=C3=A9?= , Oleksii Kurochko References: <0a006732-2b6e-46f0-a706-f432abd45d2c@suse.com> 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: <0a006732-2b6e-46f0-a706-f432abd45d2c@suse.com> They aren't used anymore. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- v2: New. --- a/xen/common/radix-tree.c +++ b/xen/common/radix-tree.c @@ -60,16 +60,14 @@ static void cf_check _rcu_node_free(stru xfree(rcu_node); } -static struct radix_tree_node *radix_tree_node_alloc( - struct radix_tree_root *root) +static struct radix_tree_node *radix_tree_node_alloc(void) { struct rcu_node *rcu_node = xzalloc(struct rcu_node); return rcu_node ? &rcu_node->node : NULL; } -static void radix_tree_node_free( - struct radix_tree_root *root, struct radix_tree_node *node) +static void radix_tree_node_free(struct radix_tree_node *node) { struct rcu_node *rcu_node = container_of(node, struct rcu_node, node); @@ -105,7 +103,7 @@ static int radix_tree_extend(struct radi do { unsigned int newheight; - if (!(node = radix_tree_node_alloc(root))) + if (!(node = radix_tree_node_alloc())) return -ENOMEM; /* Increase the height. */ @@ -156,7 +154,7 @@ int radix_tree_insert(struct radix_tree_ while (height > 0) { if (slot == NULL) { /* Have to add a child node. */ - if (!(slot = radix_tree_node_alloc(root))) + if (!(slot = radix_tree_node_alloc())) return -ENOMEM; slot->height = height; if (node) { @@ -575,7 +573,7 @@ static inline void radix_tree_shrink(str *((unsigned long *)&to_free->slots[0]) |= RADIX_TREE_INDIRECT_PTR; - radix_tree_node_free(root, to_free); + radix_tree_node_free(to_free); } } @@ -640,7 +638,7 @@ void *radix_tree_delete(struct radix_tre * last reference to it disappears (set NULL, above). */ if (to_free) - radix_tree_node_free(root, to_free); + radix_tree_node_free(to_free); if (pathp->node->count) { if (pathp->node == indirect_to_ptr(root->rnode)) @@ -656,7 +654,7 @@ void *radix_tree_delete(struct radix_tre root->height = 0; root->rnode = NULL; if (to_free) - radix_tree_node_free(root, to_free); + radix_tree_node_free(to_free); out: return slot; @@ -683,7 +681,7 @@ radix_tree_node_destroy( } } - radix_tree_node_free(root, node); + radix_tree_node_free(node); } void radix_tree_destroy( From patchwork Tue Feb 4 13:04:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 13959159 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 1D363C02196 for ; Tue, 4 Feb 2025 13:04:48 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.881422.1291560 (Exim 4.92) (envelope-from ) id 1tfIbY-0005yM-4e; Tue, 04 Feb 2025 13:04:40 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 881422.1291560; Tue, 04 Feb 2025 13:04:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tfIbY-0005yF-1h; Tue, 04 Feb 2025 13:04:40 +0000 Received: by outflank-mailman (input) for mailman id 881422; Tue, 04 Feb 2025 13:04:39 +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 1tfIbX-0005y7-1E for xen-devel@lists.xenproject.org; Tue, 04 Feb 2025 13:04:39 +0000 Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [2a00:1450:4864:20::52f]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 9612616b-e2f8-11ef-99a4-01e77a169b0f; Tue, 04 Feb 2025 14:04:37 +0100 (CET) Received: by mail-ed1-x52f.google.com with SMTP id 4fb4d7f45d1cf-5d3e6274015so9506695a12.0 for ; Tue, 04 Feb 2025 05:04:37 -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 4fb4d7f45d1cf-5dc724aa1b1sm9133149a12.50.2025.02.04.05.04.35 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 04 Feb 2025 05:04:35 -0800 (PST) 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: 9612616b-e2f8-11ef-99a4-01e77a169b0f DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1738674276; x=1739279076; 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=LL+AjvDFE1HQ/xW0epZ/WCF9BjnJU7VBrhoI6GIBxOU=; b=IOzkJWQghouo/kOi5vvlTSSz78BLwZrPQdSeQT7sqFw1WBXubJfv/iQAcyGbqVee2q zdFDYFmLTGWHrXYnlQMObSNBD+JAb67Ifwz83lsKaH5100gNXW7njkpVt6gcXr4hK9d2 VYVte8YeOgi+COKfKAmgnnzVp+HKmtE3zFlu7V8vJ8m3vn69WWwpRUkY05BH70SOMXvd WQYq8/fIPlAZcoHZwcEJD8ArCwJwRqKY5s8MPx+DDOkRG9pF+59MjCU/Qd9kzhwhGIvE /9+FCtfzAytJEA8YKjQrTRauEF/8Dz8Fwu2wLgJn2PmVliMiV6liK0U+ikyZRwYnEvi9 sa3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738674276; x=1739279076; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=LL+AjvDFE1HQ/xW0epZ/WCF9BjnJU7VBrhoI6GIBxOU=; b=BHv1cdkcPQYUcFbVjq7/2y2JD5MgZmpTkDr0BXbGRg2sdRQwzGM6HOMfj7bzZC+zXl FDDCv1JfS3AnsmpUQTFTc17S9xETcndWo5WppQH8zwSZZYewJNb16g9YksrHf4rSfhKt eWBsWyNUEJc2SaRmoHXB/PeCkl5xhl1w7p3FR6gpevTcBMXMORpOHgQ7u4WTl7n4eoui EUpqjXsO/kQpx5hImQ0sBVWTIBsfAHRhJb56lKpFuUmidzhe4vOut86Zqg6j4x/Hegff TDXGWgLBO8xudiH/zV/rysdHPBxH821oGzEdomkEIUXJ3fT95T0mgHbvCbAi3KHv+xTy IwXg== X-Gm-Message-State: AOJu0Yydj3StNX9K3zopEUtW1WTF7PiHUXpkVr8Y6taeDSF8MgypI7bA a9uKeIyL8G/2ekx5FoxMG2ArVRpvaq/XCA5TlBrdEdrdGrhDia6LV7X+40s4C2QTnXezCpE2GEI = X-Gm-Gg: ASbGncs866ge14n8nZYu+JhIUOgblJeqsEgjuQP2d7nrg7DNOzEOyluFqWbjwRvSlju +WBc0dS7VjXclOar34bIubUNTYAhlue5h4vYdjtZ+3PCxGdDRiYYLfJZrvoaEWIFzmWPYvlNGWh kw69INr+6VS4C8QNd5XAfhfVTjm64ihYdg6Ir9x5+NlELfuCGNJxWIX++RrqXNDrxFhQLuW0yZq tqBW+UOXQ1je/zMiLs9XhLMwvv34VJerw1hhttIDTZllegz1VyS2+YVP+7w+14Ns+W574bqTtab zZE+IG6RzMSJqLhgveSiF1Qc6migIdFKZkyTN63Uoyz3Dr97iK91vvdK+Q4IJ/grFKen4DFyizl v X-Google-Smtp-Source: AGHT+IHuUn07R6KRj61Y7LFHincz8m7nXSdZ0NZzKE9JyWTxZ42o6ddJEfLF8b9GhRDFnwFrpEMetA== X-Received: by 2002:a05:6402:34d3:b0:5d2:8f70:75f6 with SMTP id 4fb4d7f45d1cf-5dc5effcb22mr31410891a12.30.1738674276275; Tue, 04 Feb 2025 05:04:36 -0800 (PST) Message-ID: Date: Tue, 4 Feb 2025 14:04:35 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH v3 for-4.21 4/4] PCI: drop pci_segments_init() From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , =?utf-8?q?Roger_Pau_Monn?= =?utf-8?q?=C3=A9?= , Oleksii Kurochko , Julien Grall , Stefano Stabellini , Volodymyr Babchuk , Bertrand Marquis , Michal Orzel References: <0a006732-2b6e-46f0-a706-f432abd45d2c@suse.com> 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: <0a006732-2b6e-46f0-a706-f432abd45d2c@suse.com> Have callers invoke pci_add_segment() directly instead: With radix tree initialization moved out of the function, its name isn't quite describing anymore what it actually does. Signed-off-by: Jan Beulich --- This is entirely optional and up for discussion. There certainly also is an argument towards keeping the function. --- v3: Adjust description to accont for and re-base over dropped earlier patch. v2: New. --- a/xen/arch/arm/pci/pci.c +++ b/xen/arch/arm/pci/pci.c @@ -88,7 +88,8 @@ static int __init pci_init(void) if ( !pci_passthrough_enabled ) return 0; - pci_segments_init(); + if ( pci_add_segment(0) ) + panic("Could not initialize PCI segment 0\n"); if ( acpi_disabled ) return dt_pci_init(); --- a/xen/arch/x86/x86_64/mmconfig-shared.c +++ b/xen/arch/x86/x86_64/mmconfig-shared.c @@ -402,7 +402,8 @@ void __init acpi_mmcfg_init(void) { bool valid = true; - pci_segments_init(); + if ( pci_add_segment(0) ) + panic("Could not initialize PCI segment 0\n"); /* MMCONFIG disabled */ if ((pci_probe & PCI_PROBE_MMCONF) == 0) --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -122,12 +122,6 @@ static int pci_segments_iterate( return rc; } -void __init pci_segments_init(void) -{ - if ( !alloc_pseg(0) ) - panic("Could not initialize PCI segment 0\n"); -} - int __init pci_add_segment(u16 seg) { return alloc_pseg(seg) ? 0 : -ENOMEM; --- a/xen/include/xen/pci.h +++ b/xen/include/xen/pci.h @@ -214,7 +214,6 @@ void setup_hwdom_pci_devices(struct doma int (*handler)(uint8_t devfn, struct pci_dev *pdev)); int pci_release_devices(struct domain *d); -void pci_segments_init(void); int pci_add_segment(u16 seg); const unsigned long *pci_get_ro_map(u16 seg); int pci_add_device(u16 seg, u8 bus, u8 devfn,