From patchwork Mon Feb 12 22:30:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oscar Salvador X-Patchwork-Id: 13554127 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id E29B5C4829D for ; Mon, 12 Feb 2024 22:29:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5736D6B00BC; Mon, 12 Feb 2024 17:29:30 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4ADB66B00BD; Mon, 12 Feb 2024 17:29:30 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2FF926B00BE; Mon, 12 Feb 2024 17:29:30 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 2040B6B00BC for ; Mon, 12 Feb 2024 17:29:30 -0500 (EST) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id F0631140172 for ; Mon, 12 Feb 2024 22:29:29 +0000 (UTC) X-FDA: 81784594458.09.0882304 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by imf29.hostedemail.com (Postfix) with ESMTP id C87AA120019 for ; Mon, 12 Feb 2024 22:29:27 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=2EkLibh1; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=tC+Nwu7M; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=2EkLibh1; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=tC+Nwu7M; dmarc=pass (policy=none) header.from=suse.de; spf=pass (imf29.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.131 as permitted sender) smtp.mailfrom=osalvador@suse.de ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1707776968; a=rsa-sha256; cv=none; b=NcTcr7MIIWjNsTeA79twd3EYHRBzQWPN3LgPlzkCW7MGYr+8HiHXd1TD7Voy62lo/np9Th x67Q1cVjSF3gMof8Da2h2JKxfr1eUhqagOq2VAexHNOz3BhTYIqa+oKlSzqIMMzPabzT+E kxqn3SjQ9qrlwmJJLYEDbDKy51a+CZo= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=2EkLibh1; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=tC+Nwu7M; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=2EkLibh1; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=tC+Nwu7M; dmarc=pass (policy=none) header.from=suse.de; spf=pass (imf29.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.131 as permitted sender) smtp.mailfrom=osalvador@suse.de ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1707776968; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=kxO9mvfKurSdueDhnN3nx9fh6LQJs6PfoMaU2G6mpJQ=; b=dGSbprTFHsD7MaU3A4HNDf81IBSHgjPIMzxX+AMtGEumRBnpN60jwLxq0F99/thTYcvgxX 8d9YSd89NG++rjOVkZ6M2wbkuQE7mwsW6/8m+H4TGvADGw8B/dlfcGk1WoM6hccCO9yxTs BIy/WHQPUc4lilb5+VUKA1a5yUvGVbs= Received: from imap2.dmz-prg2.suse.org (imap2.dmz-prg2.suse.org [10.150.64.98]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 60F4F1F46E; Mon, 12 Feb 2024 22:29:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1707776966; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kxO9mvfKurSdueDhnN3nx9fh6LQJs6PfoMaU2G6mpJQ=; b=2EkLibh1T0Fpvt5mQX5cxgPHMlwcw7SrPLaJ8HP3vpqaLlAPLEjfjZosemRKQVC7usQktP iipLG7yV7zr53ZKaC1QpRqsfGkDShZY3d8MRRXjgN/zj3vssnEC3Kr02aK1diL+lYxp831 EUpqNZHOw0EC9jd3i3AWNhl0i28Zc64= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1707776966; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kxO9mvfKurSdueDhnN3nx9fh6LQJs6PfoMaU2G6mpJQ=; b=tC+Nwu7MsfACk+TPLrMCNykGk2INKq1bt5vpxNJwB860dZMWrxGpymKG8NT0/qgyClXS23 bRvhU3JQLYp9LpDQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1707776966; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kxO9mvfKurSdueDhnN3nx9fh6LQJs6PfoMaU2G6mpJQ=; b=2EkLibh1T0Fpvt5mQX5cxgPHMlwcw7SrPLaJ8HP3vpqaLlAPLEjfjZosemRKQVC7usQktP iipLG7yV7zr53ZKaC1QpRqsfGkDShZY3d8MRRXjgN/zj3vssnEC3Kr02aK1diL+lYxp831 EUpqNZHOw0EC9jd3i3AWNhl0i28Zc64= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1707776966; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kxO9mvfKurSdueDhnN3nx9fh6LQJs6PfoMaU2G6mpJQ=; b=tC+Nwu7MsfACk+TPLrMCNykGk2INKq1bt5vpxNJwB860dZMWrxGpymKG8NT0/qgyClXS23 bRvhU3JQLYp9LpDQ== Received: from imap2.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap2.dmz-prg2.suse.org (Postfix) with ESMTPS id 5FF5513212; Mon, 12 Feb 2024 22:29:25 +0000 (UTC) Received: from dovecot-director2.suse.de ([10.150.64.162]) by imap2.dmz-prg2.suse.org with ESMTPSA id gDGZFMWbymX5JgAAn2gu4w (envelope-from ); Mon, 12 Feb 2024 22:29:25 +0000 From: Oscar Salvador To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Michal Hocko , Vlastimil Babka , Marco Elver , Andrey Konovalov , Alexander Potapenko , Oscar Salvador Subject: [PATCH v8 1/5] lib/stackdepot: Move stack_record struct definition into the header Date: Mon, 12 Feb 2024 23:30:25 +0100 Message-ID: <20240212223029.30769-2-osalvador@suse.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240212223029.30769-1-osalvador@suse.de> References: <20240212223029.30769-1-osalvador@suse.de> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: C87AA120019 X-Stat-Signature: 9nwjydu3cbmbnokhisqtj9zhdshubzun X-HE-Tag: 1707776967-690448 X-HE-Meta: U2FsdGVkX18LBva00C/vjv0LeIpYnUO9RFw0h7v/zbDcpQAp/aD8Lmt9TcbWC82oyjqIDg0D6o5yQACroKGfIOfOBLgK75OfRmX7mSmWI5TyV4VenppG6mi538JNDZV+sDCIWAImE/4VlTCis26of45XoxZ8qNz3nNtMUDTIyIELAJIkK8n0FoOgx80/wwXwlP1YhvaiLZ5ELrdDG6tLKP3Dfdscst3W79kiWvs2d2+H+6zAU1xzagpj5Izs5nf2PpjKA6RX05m/GSMyqHlxRCBJmuaQrNSvVBr2lzQ7P7W4WmKFybMQ5w11XQFxMJS2eQzjAeqT9rHuEtTAs6FKGRYtkzPBibDx3noVxdK38OQsPYnw45VDUECVNBqU5DKOx86Kgp7uJW+EVfhVEbmtjUeIy9sV/gWjT7yQ8DInW+IrmNI2HVwDi82nQ0GfmvolxCO/MV9hzzj2NKWAieZRA7fLcRCTg5q+bpcpPkbpNy+XeP7r3i07Ee9DpWkMmpxXz/pN8m85UDg/Vk3HkGBTM9Q3r0gv8Sy/MTJ1hanrDHbmFUSnDk+mL1rU5krxcREOpFCQCfrSY6nfZ/jJtvlbBzQ+wKQinppcMf8oJRYEUcHvqBwKXxDRX6Yn9YJ3viN/JHQlgaDF/yz6kRHDb34Z6ljwnPRul+Rc3F1g7pqIbTgePjFcc589mVPgV0RXRhOUJoBiPwzlr6p6E2gs/FhneAY/fmyDSneRZgolaPOMacScjjOka/mokNsLr2jsxbWpOyTllCmaQszO4reZAtvtU7w4tt0UPPCc7etrLVxqQ4k2iY+TAjUFrp1egEtQJ/4SuFFKbWRmR/nh0MCLDbDMNv56w6sB2OmlBM656Cy3tNqc/OpmiQbjRcDHjTPCJHLwzUpaBDUit8D5lNy3QkI+0ySAMiPMzZOZoDQVr+XDWJl4LhdBIZ0B69OvDNkNE5S4YH/1wsqtncIaKIb7VFl 9brjlgNt sP4MFCXP3hcxgYYJkeC9+9pde0AUH1Le21i7MZJTSuLREvRKm2r0c9aaOY5Q5tyZr1uLfkfAa3WQPEk12SpAjEBC2DRi3A/KpVopZF4MmlHy3LIzxGvSh2Uu3taVoZtI/oYigMX3B8d/isI7RQ08Rnp1Zmd9s/LML759Ji+Ke4SrHpNB/wftDNZdfa/Gdk4ObojqXrtxRvxAW3byeDB3hztQA/utHHg2RZtt6ELStFNCTruOfqvkkDGtq4WkRIajRYGM8 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: In order to move the heavy lifting into page_owner code, this one needs to have access to the stack_record structure, which right now sits in lib/stackdepot.c. Move it to the stackdepot.h header so page_owner can access stack_record's struct fields. Signed-off-by: Oscar Salvador Reviewed-by: Marco Elver Reviewed-by: Vlastimil Babka --- include/linux/stackdepot.h | 44 ++++++++++++++++++++++++++++++++++++++ lib/stackdepot.c | 43 ------------------------------------- 2 files changed, 44 insertions(+), 43 deletions(-) diff --git a/include/linux/stackdepot.h b/include/linux/stackdepot.h index adcbb8f23600..90274860fd8e 100644 --- a/include/linux/stackdepot.h +++ b/include/linux/stackdepot.h @@ -30,6 +30,50 @@ typedef u32 depot_stack_handle_t; */ #define STACK_DEPOT_EXTRA_BITS 5 +#define DEPOT_HANDLE_BITS (sizeof(depot_stack_handle_t) * 8) + +#define DEPOT_POOL_ORDER 2 /* Pool size order, 4 pages */ +#define DEPOT_POOL_SIZE (1LL << (PAGE_SHIFT + DEPOT_POOL_ORDER)) +#define DEPOT_STACK_ALIGN 4 +#define DEPOT_OFFSET_BITS (DEPOT_POOL_ORDER + PAGE_SHIFT - DEPOT_STACK_ALIGN) +#define DEPOT_POOL_INDEX_BITS (DEPOT_HANDLE_BITS - DEPOT_OFFSET_BITS - \ + STACK_DEPOT_EXTRA_BITS) + +/* Compact structure that stores a reference to a stack. */ +union handle_parts { + depot_stack_handle_t handle; + struct { + u32 pool_index : DEPOT_POOL_INDEX_BITS; + u32 offset : DEPOT_OFFSET_BITS; + u32 extra : STACK_DEPOT_EXTRA_BITS; + }; +}; + +struct stack_record { + struct list_head hash_list; /* Links in the hash table */ + u32 hash; /* Hash in hash table */ + u32 size; /* Number of stored frames */ + union handle_parts handle; /* Constant after initialization */ + refcount_t count; + union { + unsigned long entries[CONFIG_STACKDEPOT_MAX_FRAMES]; /* Frames */ + struct { + /* + * An important invariant of the implementation is to + * only place a stack record onto the freelist iff its + * refcount is zero. Because stack records with a zero + * refcount are never considered as valid, it is safe to + * union @entries and freelist management state below. + * Conversely, as soon as an entry is off the freelist + * and its refcount becomes non-zero, the below must not + * be accessed until being placed back on the freelist. + */ + struct list_head free_list; /* Links in the freelist */ + unsigned long rcu_state; /* RCU cookie */ + }; + }; +}; + typedef u32 depot_flags_t; /* diff --git a/lib/stackdepot.c b/lib/stackdepot.c index 4a7055a63d9f..6f9095374847 100644 --- a/lib/stackdepot.c +++ b/lib/stackdepot.c @@ -36,54 +36,11 @@ #include #include -#define DEPOT_HANDLE_BITS (sizeof(depot_stack_handle_t) * 8) - -#define DEPOT_POOL_ORDER 2 /* Pool size order, 4 pages */ -#define DEPOT_POOL_SIZE (1LL << (PAGE_SHIFT + DEPOT_POOL_ORDER)) -#define DEPOT_STACK_ALIGN 4 -#define DEPOT_OFFSET_BITS (DEPOT_POOL_ORDER + PAGE_SHIFT - DEPOT_STACK_ALIGN) -#define DEPOT_POOL_INDEX_BITS (DEPOT_HANDLE_BITS - DEPOT_OFFSET_BITS - \ - STACK_DEPOT_EXTRA_BITS) #define DEPOT_POOLS_CAP 8192 #define DEPOT_MAX_POOLS \ (((1LL << (DEPOT_POOL_INDEX_BITS)) < DEPOT_POOLS_CAP) ? \ (1LL << (DEPOT_POOL_INDEX_BITS)) : DEPOT_POOLS_CAP) -/* Compact structure that stores a reference to a stack. */ -union handle_parts { - depot_stack_handle_t handle; - struct { - u32 pool_index : DEPOT_POOL_INDEX_BITS; - u32 offset : DEPOT_OFFSET_BITS; - u32 extra : STACK_DEPOT_EXTRA_BITS; - }; -}; - -struct stack_record { - struct list_head hash_list; /* Links in the hash table */ - u32 hash; /* Hash in hash table */ - u32 size; /* Number of stored frames */ - union handle_parts handle; /* Constant after initialization */ - refcount_t count; - union { - unsigned long entries[CONFIG_STACKDEPOT_MAX_FRAMES]; /* Frames */ - struct { - /* - * An important invariant of the implementation is to - * only place a stack record onto the freelist iff its - * refcount is zero. Because stack records with a zero - * refcount are never considered as valid, it is safe to - * union @entries and freelist management state below. - * Conversely, as soon as an entry is off the freelist - * and its refcount becomes non-zero, the below must not - * be accessed until being placed back on the freelist. - */ - struct list_head free_list; /* Links in the freelist */ - unsigned long rcu_state; /* RCU cookie */ - }; - }; -}; - static bool stack_depot_disabled; static bool __stack_depot_early_init_requested __initdata = IS_ENABLED(CONFIG_STACKDEPOT_ALWAYS_INIT); static bool __stack_depot_early_init_passed __initdata;