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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 01866C3064D for ; Tue, 25 Jun 2024 14:24:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 913496B02D1; Tue, 25 Jun 2024 10:24:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8C2C56B02D3; Tue, 25 Jun 2024 10:24:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 73CA66B02D4; Tue, 25 Jun 2024 10:24:53 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 567D86B02D1 for ; Tue, 25 Jun 2024 10:24:53 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id E94EB1C0017 for ; Tue, 25 Jun 2024 14:24:52 +0000 (UTC) X-FDA: 82269632424.25.5A52F0F Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by imf06.hostedemail.com (Postfix) with ESMTP id 90698180016 for ; Tue, 25 Jun 2024 14:24:50 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=s29fdSkT; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=Wr7OZJAl; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=s29fdSkT; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=Wr7OZJAl; spf=pass (imf06.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.131 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1719325483; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=yuEJ34JVFFiDDuu65qHBfAWBmRhDid8UKlEwTuuVx8A=; b=zpD/TdSdZZMjWn06Vwos4VCy49CKXXGMoD8aMmiCd3fLRYPrZDc9O0u1Z3l+bLmBn02s/L rXTSxhpEq5xLR+VLz+DPAWaWo9zPzheLmQxaB7bWsKTde5jVVaWfKyHBn2Ii0+yKKM1jvM rErZpxKnQebysyjySzktELcL/DGMmA8= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=s29fdSkT; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=Wr7OZJAl; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=s29fdSkT; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=Wr7OZJAl; spf=pass (imf06.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.131 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1719325483; a=rsa-sha256; cv=none; b=OLreAKVDjrt/jgHkX/1D8psS0vS/Bn5tMcGk2OxpAGkz3lXqu7ADnh1I2rZ1KSvOAYeJyQ atYmTZ11XMBPkQoya2Zy/HAVK00QUGy5T/TnVwJ2XVJyTCjowO5tjKqsVaZ2S4Ul1nMz3P X5yKhjCnJa0c1zSLv+Ff5uakXk5kLsA= Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (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 C75211F889; Tue, 25 Jun 2024 14:24:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1719325488; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=yuEJ34JVFFiDDuu65qHBfAWBmRhDid8UKlEwTuuVx8A=; b=s29fdSkTlsRdgf37UqsEcd8ui21AXmEBqS5RSDlmuZ6rbUu+/50o4fbmtHe19UAkEcuPSG n1ALlXdgXFWHp2YSo3BajTcGwPsn3hH/aFJQGhpah7W0W5TaWvzgTgOJuV92NgmNAzYHV0 0kbMgPcYedfDkEIBIPjcuVY3I4dhBak= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1719325488; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=yuEJ34JVFFiDDuu65qHBfAWBmRhDid8UKlEwTuuVx8A=; b=Wr7OZJAlcY/mTO9S5s+V9PPtP9a53neExu8myhnt1ms5bC+kXdbEOWwqQda3hSRaF4kiY9 1TzvqBjqTBbzvkDg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1719325488; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=yuEJ34JVFFiDDuu65qHBfAWBmRhDid8UKlEwTuuVx8A=; b=s29fdSkTlsRdgf37UqsEcd8ui21AXmEBqS5RSDlmuZ6rbUu+/50o4fbmtHe19UAkEcuPSG n1ALlXdgXFWHp2YSo3BajTcGwPsn3hH/aFJQGhpah7W0W5TaWvzgTgOJuV92NgmNAzYHV0 0kbMgPcYedfDkEIBIPjcuVY3I4dhBak= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1719325488; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=yuEJ34JVFFiDDuu65qHBfAWBmRhDid8UKlEwTuuVx8A=; b=Wr7OZJAlcY/mTO9S5s+V9PPtP9a53neExu8myhnt1ms5bC+kXdbEOWwqQda3hSRaF4kiY9 1TzvqBjqTBbzvkDg== Received: from imap1.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 imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 9E85013A9A; Tue, 25 Jun 2024 14:24:48 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id QJVZJjDTemaMKwAAD6G6ig (envelope-from ); Tue, 25 Jun 2024 14:24:48 +0000 Message-ID: <78177ff2-e140-4e81-9b2a-be5bece34cfc@suse.cz> Date: Tue, 25 Jun 2024 16:24:48 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 6/7] mm, slab: add static key for should_failslab() Content-Language: en-US To: Akinobu Mita , Christoph Lameter , David Rientjes , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , "Naveen N. Rao" , Anil S Keshavamurthy , "David S. Miller" , Masami Hiramatsu , Steven Rostedt , Mark Rutland Cc: Jiri Olsa , Roman Gushchin , Hyeonggon Yoo <42.hyeyoo@gmail.com>, linux-kernel@vger.kernel.org, linux-mm@kvack.org, bpf@vger.kernel.org, linux-trace-kernel@vger.kernel.org References: <20240620-fault-injection-statickeys-v2-0-e23947d3d84b@suse.cz> <20240620-fault-injection-statickeys-v2-6-e23947d3d84b@suse.cz> From: Vlastimil Babka Autocrypt: addr=vbabka@suse.cz; keydata= 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 EP+ylKVEKb0Q2A== In-Reply-To: <20240620-fault-injection-statickeys-v2-6-e23947d3d84b@suse.cz> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspam-User: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 90698180016 X-Stat-Signature: dfgjmwzoitsijfxcnixbcnmagb1xck6t X-HE-Tag: 1719325490-199830 X-HE-Meta: U2FsdGVkX19A7RRXNJ0AhURVTZnT50/f9sktr1Da+5wg942FdH4Wr167TS7+7s9MicowZCkscbW3bavSyuboHOpp9KBA6szkcMNvWfGfOhv5pckr1mu454YM+OOy5o4hqj2opsU2lvQEjPugBXTElrfzEYAOPwfg3H/lUW8HO7JEq7EFT0w2C5ykv54w9TD3ohPDtkaW2qsdOpf4m6OyEmdclCsOnrRZkwKuhDa5tFVh3bCCYT3tQXmn6VHHx7+jpbQqzaUDAsk32qk2vY+A9D4ecRABeV9/8Q2+Tzw6dj4ZJt0dVccT+Wf4DRh81SkL71QTXCZAO4bB5bzBqLrdl3lgimU+A/NlYBPmq2R7e04M36vjaQ6C5/xawNJF3wjlQMbmx6/rzcU4TeTf4npFxvCSHiUaCr/oV0sJH4r5tbvwT5/32tSVHo2itfLDVfn6Es1T1Ja6wK6ChHoEFy8MBH3u9aXDcyBl8BzbqGR2qcj2shdcWV13kQJ0bJ22UTQ0lWzZ4KUiVgv8fx2Lp/qtFnMDPuvZ6qc2hJUtNZp5w8TbpPDERNoUrarTM8GdcBTISk3ht5imycRQ3KotPT+T7sDKyOs5QAefrmSBRfxBN7XRgVLDN3fyIAfnCbfGuOl3nYcDYsnYxWr9vSAY1pxCIY7YDv+iUP00JujojxZGKzUldXambZN0YCmH19V6r4hlj6B0U1wtfhqknjiciKsb7bp5IkwNwHIstx82mFG9LuDSc0xEu+FXsD6wzsc9xCVwIVg9ArY4nfmZs6v9cXjJUGOA45jaZfspD4eTCW/AqNnQpILE3Uwu5XbtGEflY9l6Q7QYIymfOKWXDVEO4OLD7qOVCh3YpGPLqa5fPnSzVkdkqbUt6OtmE5WV0ueMqKfhMA3WeYWb51H7Yfe7J9UaffQYOuBKORchY9Q7llFqoB1OWWvLR8DobLiVdbPegUGTGfds7jFXDQRWGjLypjI 9kP1Ulfp bnogf69jW61e6ES9uMvKgwamKKpQg5wvj8TQ9IUWmScNVgFrL09OJnDzFoxKEuh+bWlBtas/ICLEleFb2+gRCALn5s/q/uGGpFmUU9LUvacrDolbJbohsqwhwH+w0zYQO4V199WSHfa+dLlkTFNdzcAVx5mk5xjHlttgu16Oy1Vsih9rqGd0doSkNqkMu0Rb5D4EuuXVs90TmAR5Xyo3BveteoKSvFbdIUaZz6nPfeWMMuCgPR2iBZVU35Tl3Yp1CBeyzZ4FlB/rHpqZFYqE0SK+11Ye67C7psxFJrCLK/J7Oy6epEWaQ6XGXbZPFZvBNO5VkdyuQYrqDtH97R5GTAPY/SEkAVyUI9x0wJ+Kc7k9HzDOWlKlmT9AZOD0VoXQweR1j9QF4qKuGKCZY3bjphlidCA== 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: On 6/20/24 12:49 AM, Vlastimil Babka wrote: > --- a/mm/slub.c > +++ b/mm/slub.c > @@ -3874,13 +3874,37 @@ static __always_inline void maybe_wipe_obj_freeptr(struct kmem_cache *s, > 0, sizeof(void *)); > } > > -noinline int should_failslab(struct kmem_cache *s, gfp_t gfpflags) > +#if defined(CONFIG_FUNCTION_ERROR_INJECTION) || defined(CONFIG_FAILSLAB) > +DEFINE_STATIC_KEY_FALSE(should_failslab_active); > + > +#ifdef CONFIG_FUNCTION_ERROR_INJECTION > +noinline > +#else > +static inline > +#endif > +int should_failslab(struct kmem_cache *s, gfp_t gfpflags) Note that it has been found that (regardless of this series) gcc may clone this to a should_failslab.constprop.0 in case the function is empty because __should_failslab is compiled out (CONFIG_FAILSLAB=n). The "noinline" doesn't help - the original function stays but only the clone is actually being called, thus overriding the original function achieves nothing, see: https://github.com/bpftrace/bpftrace/issues/3258 So we could use __noclone to prevent that, and I was thinking by adding something this to error-injection.h: #ifdef CONFIG_FUNCTION_ERROR_INJECTION #define __error_injectable(alternative) noinline __noclone #else #define __error_injectable(alternative) alternative #endif and the usage here would be: __error_injectable(static inline) int should_failslab(...) Does that look acceptable, or is it too confusing that "static inline" is specified there as the storage class to use when error injection is actually disabled? > { > if (__should_failslab(s, gfpflags)) > return -ENOMEM; > return 0; > } > -ALLOW_ERROR_INJECTION(should_failslab, ERRNO); > +ALLOW_ERROR_INJECTION_KEY(should_failslab, ERRNO, &should_failslab_active); > + > +static __always_inline int should_failslab_wrapped(struct kmem_cache *s, > + gfp_t gfp) > +{ > + if (static_branch_unlikely(&should_failslab_active)) > + return should_failslab(s, gfp); > + else > + return 0; > +} > +#else > +static __always_inline int should_failslab_wrapped(struct kmem_cache *s, > + gfp_t gfp) > +{ > + return false; > +} > +#endif > > static __fastpath_inline > struct kmem_cache *slab_pre_alloc_hook(struct kmem_cache *s, gfp_t flags) > @@ -3889,7 +3913,7 @@ struct kmem_cache *slab_pre_alloc_hook(struct kmem_cache *s, gfp_t flags) > > might_alloc(flags); > > - if (unlikely(should_failslab(s, flags))) > + if (should_failslab_wrapped(s, flags)) > return NULL; > > return s; >