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=-8.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=ham 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 52C00C433DB for ; Mon, 22 Mar 2021 09:06:18 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id C4BB461973 for ; Mon, 22 Mar 2021 09:06:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C4BB461973 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 8B6266B0075; Mon, 22 Mar 2021 04:47:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 866036B0078; Mon, 22 Mar 2021 04:47:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 719F96B007B; Mon, 22 Mar 2021 04:47:26 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0148.hostedemail.com [216.40.44.148]) by kanga.kvack.org (Postfix) with ESMTP id 580886B0075 for ; Mon, 22 Mar 2021 04:47:26 -0400 (EDT) Received: from smtpin05.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id A95C6582B for ; Mon, 22 Mar 2021 09:06:16 +0000 (UTC) X-FDA: 77946928752.05.1979B94 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf15.hostedemail.com (Postfix) with ESMTP id CC6FDA0009E0 for ; Mon, 22 Mar 2021 09:06:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=y88xpMhgq5zhCFUMWKJhYJpArZg4gL5FM5u/M3LEbN0=; b=NG7ypSSQhKuIShw+4yjVov+Uxw ISo3H4b1YKU3thK66l5MuRg0hA+qGX28eHgUkWAqXnr6H7kJkR49zQZm6gwwerdOKX3IAERKulGlE F4RMGCb3Yt+ntR3VgoME/FqF56PbW/3r4fMpeOWeTM2xdemPZ4a44hy2gRF6GV6xNivkWUVWIhdlB 9zWvM1l/sSUOoFQaDmzsk03dU7qwJIYn3ciZx/k9gqv0tpuU4VicwKSkpz7vxw2OfMiLaWbkS6rE/ BRi4quh4eQAjEnISiOtj13/H57MnU7ntDPVPE7TN/FX804oY2h6pvPI3kvRhIYjiAHWwdy4jVFEHQ OC/R89Rw==; Received: from willy by casper.infradead.org with local (Exim 4.94 #2 (Red Hat Linux)) id 1lOGVE-008FGi-S6; Mon, 22 Mar 2021 09:05:41 +0000 Date: Mon, 22 Mar 2021 09:05:36 +0000 From: Matthew Wilcox To: Antoine Tenart Cc: kernel test robot , "David S. Miller" , Alexander Duyck , LKML , Linux Memory Management List , lkp@lists.01.org, lkp@intel.com, ltp@lists.linux.it Subject: Re: [net] 5478fcd0f4: BUG:sleeping_function_called_from_invalid_context_at_include/linux/sched/mm.h Message-ID: <20210322090536.GK1719932@casper.infradead.org> References: <20210322083553.GI32426@xsang-OptiPlex-9020> <161640335063.3537.6668586361113979688@kwain.local> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <161640335063.3537.6668586361113979688@kwain.local> X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: CC6FDA0009E0 X-Stat-Signature: 3rzf8rb9un9pwnhftx7koje7wac5qijh Received-SPF: none (infradead.org>: No applicable sender policy available) receiver=imf15; identity=mailfrom; envelope-from=""; helo=casper.infradead.org; client-ip=90.155.50.34 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1616403975-762843 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: On Mon, Mar 22, 2021 at 09:55:50AM +0100, Antoine Tenart wrote: > I only had a quick look at this, but I think the issue should be fixed > with: > > diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c > index e16d54aabd4c..3ae3c20eb64c 100644 > --- a/net/core/net-sysfs.c > +++ b/net/core/net-sysfs.c > @@ -1378,7 +1378,7 @@ static ssize_t xps_queue_show(struct net_device *dev, unsigned int index, > nr_ids = dev_maps ? dev_maps->nr_ids : > (type == XPS_CPUS ? nr_cpu_ids : dev->num_rx_queues); > > - mask = bitmap_zalloc(nr_ids, GFP_KERNEL); > + mask = bitmap_zalloc(nr_ids, GFP_ATOMIC); > if (!mask) { > rcu_read_unlock(); > return -ENOMEM; sysfs isn't a good reason to use GFP_ATOMIC. try something like this: - mask = bitmap_zalloc(nr_ids, GFP_KERNEL); + mask = bitmap_zalloc(nr_ids, GFP_NOWAIT); if (!mask) { + int new_nr_ids; + rcu_read_unlock(); - return -ENOMEM; + mask = bitmap_zalloc(nr_ids, GFP_KERNEL); + if (!mask) + return -ENOMEM; + rcu_read_lock(); + dev_maps = rcu_dereference(dev->xps_maps[type]); + /* if nr_ids shrank while we slept, do not overrun array. + * if it increased, we just won't show the new ones + */ + new_nr_ids = dev_maps ? dev_maps->nr_ids : + (type == XPS_CPUS ? nr_cpu_ids : dev->num_rx_queues); + if (new_nr_ids < nr_ids) + nr_ids = new_nr_ids;