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 X-Spam-Level: X-Spam-Status: No, score=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 14541C63798 for ; Sat, 21 Nov 2020 11:35:29 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C94A82224A for ; Sat, 21 Nov 2020 11:35:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=ziepe.ca header.i=@ziepe.ca header.b="kVX4x5fp" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C94A82224A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ziepe.ca Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A47616E9A7; Sat, 21 Nov 2020 11:35:24 +0000 (UTC) Received: from mail-qt1-x841.google.com (mail-qt1-x841.google.com [IPv6:2607:f8b0:4864:20::841]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2181D6E8E5 for ; Fri, 20 Nov 2020 18:07:23 +0000 (UTC) Received: by mail-qt1-x841.google.com with SMTP id b16so7756832qtb.6 for ; Fri, 20 Nov 2020 10:07:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ziepe.ca; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=qzxXYsRioiP+WS2W7+JqANiIkJuxsiB0XH0K0d6+qtg=; b=kVX4x5fpgWWco5Ty/z9+LAK78NhaMagv/tDBnm6DUUeCWaj1HGUIBbp2aJhNnNEDUX 3IMNQ6fbdY/PqyJeGpV5XT5MgmuXF/v6yWfNDjhcSQMDpwtr4+hJbu4qzdlNIbE032j8 N6WJP4W+ttGh8C6hBS0bHnuTG8JeA6PqV00NQ1bEloyaSOSySEoGweqsuBTnHZ5oOVe5 XKsn1y3u4gVoVT0r8VMZFNv/f6Pn/mmX1yQCnK2oUwYxk5go3vzZ3Bk/GbZSg3FiOcOx 72YuC+2VxZ6koXFYbos9ZFiX1/r83F90VF+cOVa4au/lfdem40sM6v1eigLfygQrHcDA NXpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=qzxXYsRioiP+WS2W7+JqANiIkJuxsiB0XH0K0d6+qtg=; b=G/1y5MQ4SaQ1sABDj7BlDcQO2Q94F32EupyqgobMJ0SdgR102gPokQVDWOrO7AFhJ/ VZHkNFlDht+oY69A2pvkjvLRe2bP52LzZoB+wnssehHzStXVOli0qilg0NQUuFsfiCHo sKtMSr85k/vozWk/lpAP9JcqTJoVAPujPBWlmBgEQfiRlBVPX1657O3k4ML9hgMOGyKn 1n4MVHic/xQq2CmQCmI+hqx/3tlFqf5CdDs3ChRldrbGA71xzqRvpin8snoluMr8zKKl bN0t9eLl48fTtevtd4A07Y9BUbQTtxUNbJYYyY+Zz+dcB8myZkajSv6FD9JjDpBWYXsF GOrA== X-Gm-Message-State: AOAM5322uTQHBnq0WaU9p9EIJhHAKiyXUsJBveiRG2q/TIjXQFT5vLBg 1ObVEzmFXzhzPOUUGUHygT3HjA== X-Google-Smtp-Source: ABdhPJz17n7O3IQoUnG1lr3Y+t6u4VkEghZe6VwPVl7Std3Wem+S+IGdLYrv/xtqRZWsm/mbwrw9gw== X-Received: by 2002:ac8:6a16:: with SMTP id t22mr16861888qtr.304.1605895641688; Fri, 20 Nov 2020 10:07:21 -0800 (PST) Received: from ziepe.ca (hlfxns017vw-156-34-48-30.dhcp-dynamic.fibreop.ns.bellaliant.net. [156.34.48.30]) by smtp.gmail.com with ESMTPSA id q15sm2444862qki.13.2020.11.20.10.07.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Nov 2020 10:07:20 -0800 (PST) Received: from jgg by mlx with local (Exim 4.94) (envelope-from ) id 1kgAoZ-008uHM-Rm; Fri, 20 Nov 2020 14:07:19 -0400 Date: Fri, 20 Nov 2020 14:07:19 -0400 From: Jason Gunthorpe To: Daniel Vetter Subject: Re: [PATCH 2/3] mm: Extract might_alloc() debug check Message-ID: <20201120180719.GO244516@ziepe.ca> References: <20201120095445.1195585-1-daniel.vetter@ffwll.ch> <20201120095445.1195585-3-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20201120095445.1195585-3-daniel.vetter@ffwll.ch> X-Mailman-Approved-At: Sat, 21 Nov 2020 11:34:30 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Zijlstra , Sebastian Andrzej Siewior , Dave Chinner , DRI Development , linux-mm@kvack.org, Daniel Vetter , Christoph Lameter , Michel Lespinasse , Ingo Molnar , linux-xfs@vger.kernel.org, "Matthew Wilcox \(Oracle\)" , David Rientjes , Waiman Long , "Paul E . McKenney" , Intel Graphics Development , Mathieu Desnoyers , Thomas Gleixner , Joonsoo Kim , Vlastimil Babka , Randy Dunlap , LKML , Pekka Enberg , linux-fsdevel@vger.kernel.org, Qian Cai , Andrew Morton Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Fri, Nov 20, 2020 at 10:54:43AM +0100, Daniel Vetter wrote: > diff --git a/include/linux/sched/mm.h b/include/linux/sched/mm.h > index d5ece7a9a403..f94405d43fd1 100644 > --- a/include/linux/sched/mm.h > +++ b/include/linux/sched/mm.h > @@ -180,6 +180,22 @@ static inline void fs_reclaim_acquire(gfp_t gfp_mask) { } > static inline void fs_reclaim_release(gfp_t gfp_mask) { } > #endif > > +/** > + * might_alloc - Marks possible allocation sites > + * @gfp_mask: gfp_t flags that would be use to allocate > + * > + * Similar to might_sleep() and other annotations this can be used in functions > + * that might allocate, but often dont. Compiles to nothing without > + * CONFIG_LOCKDEP. Includes a conditional might_sleep() if @gfp allows blocking. > + */ > +static inline void might_alloc(gfp_t gfp_mask) > +{ > + fs_reclaim_acquire(gfp_mask); > + fs_reclaim_release(gfp_mask); > + > + might_sleep_if(gfpflags_allow_blocking(gfp_mask)); > +} Reviewed-by: Jason Gunthorpe Oh, I just had a another thread with Matt about xarray, this would be perfect to add before xas_nomem(): diff --git a/lib/idr.c b/lib/idr.c index f4ab4f4aa3c7f5..722d9ddff53221 100644 --- a/lib/idr.c +++ b/lib/idr.c @@ -391,6 +391,8 @@ int ida_alloc_range(struct ida *ida, unsigned int min, unsigned int max, if ((int)max < 0) max = INT_MAX; + might_alloc(gfp); + retry: xas_lock_irqsave(&xas, flags); next: diff --git a/lib/xarray.c b/lib/xarray.c index 5fa51614802ada..dd260ee7dcae9a 100644 --- a/lib/xarray.c +++ b/lib/xarray.c @@ -1534,6 +1534,8 @@ void *__xa_store(struct xarray *xa, unsigned long index, void *entry, gfp_t gfp) XA_STATE(xas, xa, index); void *curr; + might_alloc(gfp); + if (WARN_ON_ONCE(xa_is_advanced(entry))) return XA_ERROR(-EINVAL); if (xa_track_free(xa) && !entry) @@ -1600,6 +1602,8 @@ void *__xa_cmpxchg(struct xarray *xa, unsigned long index, XA_STATE(xas, xa, index); void *curr; + might_alloc(gfp); + if (WARN_ON_ONCE(xa_is_advanced(entry))) return XA_ERROR(-EINVAL); @@ -1637,6 +1641,8 @@ int __xa_insert(struct xarray *xa, unsigned long index, void *entry, gfp_t gfp) XA_STATE(xas, xa, index); void *curr; + might_alloc(gfp); + if (WARN_ON_ONCE(xa_is_advanced(entry))) return -EINVAL; if (!entry) @@ -1806,6 +1812,8 @@ int __xa_alloc(struct xarray *xa, u32 *id, void *entry, { XA_STATE(xas, xa, 0); + might_alloc(gfp); + if (WARN_ON_ONCE(xa_is_advanced(entry))) return -EINVAL; if (WARN_ON_ONCE(!xa_track_free(xa))) _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel