Received: by 2002:ac0:a5b6:0:0:0:0:0 with SMTP id m51-v6csp2197938imm; Mon, 28 May 2018 03:45:42 -0700 (PDT) X-Google-Smtp-Source: AB8JxZojxOFEIYd7T6yei8rLEw/wQEJqnbjpfjjZORAh1Ldj1qWZbvJ5z1B83PHG842wvEtSI5TO X-Received: by 2002:a62:ae13:: with SMTP id q19-v6mr12911806pff.155.1527504342748; Mon, 28 May 2018 03:45:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527504342; cv=none; d=google.com; s=arc-20160816; b=C08jSLhfath6jsuFJIvPuTli/754Nd+WBFloi2KbHCHDTeDacAStE7ADg+LwOD0M+D bbh8etSLU6tMEmE9JJrleeIm5uxj6+tsVx338eXxMtrIBxgnppR6AIWnc3k7hyX9fkSO oofCbLmFETFXBVLHNsCVmrcIzAFwfjtdluZ43CcecjxiMiQS1gklkaAWsfcxlpHapWMx 8D4QMc2takMo/qN+pvvOx4aY91qYhsFdso1zbi38Mjr5/Dm+kcCOfXbX2SRyo4Qv8rJ5 rGp1iKh9qTqm1EY4tn76mtp+Ym9RFO5n3fUwedHmtQAbbkZyYlICLLBrjhYU7Hi42RQc eNig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=q30hdyrTpNfO75zZksJzd3gbQTvLzpTlDNvxOijAWyg=; b=uq7Fp4ny0WBTe1FSmo841l5HPuIpYbNROiPA/uFEThd5fVYGdHCyVNc3ehQW5M6c7l eX7eKyT0ds1r31wLg4LQoX80+L7PDZ4bBt27kv2YpcHXVBNZ3vX81dgu0Ets8HEzRMjZ h/F7qnmgpuX3PaGgQmdJuI8dWra0X8k5R7jEzcaK7yufNtH6bmPHYgUVBos76gw8E2ia SedQmFaIBc0+hu+o6XOfV2jVWQMJyQ6speVfNp4rwVl+zyxQGj7pgCNnMaxLiyz8zef2 3f0XmBNnqBIwjy0rSTBcJZTnBbLApVqFSZPrVdjGF3V0zHgpXQsXVPg1EawRlsx6nCJs 7xiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=NQTbeXmz; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 71-v6si30543973plc.164.2018.05.28.03.45.28; Mon, 28 May 2018 03:45:42 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=NQTbeXmz; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S937052AbeE1KpW (ORCPT + 99 others); Mon, 28 May 2018 06:45:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:35832 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S937741AbeE1KpP (ORCPT ); Mon, 28 May 2018 06:45:15 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DCF99204EE; Mon, 28 May 2018 10:45:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1527504315; bh=JJxo8zOHXiYACKy1G8zG3+jbH3Saz5K84IH/0J762y0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NQTbeXmzFT7N5AItqsc8/V+HseACNvUc7hEYgTE2wP0lgNAK0w/t+Vd+ZOBtLTqwi GiB8lqqOO1tHSZ3LJkkwUTOIFXXJxhwFQoiQbgjGFV489eqi+Di3cJyPZwVRMel1aI AyqPZxJoDWxknpI11qyJ1SJRY/NsZ52do2Kg0nI0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sara Sharon , Luca Coelho , Johannes Berg , Sasha Levin Subject: [PATCH 4.14 093/496] mac80211: fix calling sleeping function in atomic context Date: Mon, 28 May 2018 11:57:58 +0200 Message-Id: <20180528100323.792889780@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180528100319.498712256@linuxfoundation.org> References: <20180528100319.498712256@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sara Sharon [ Upstream commit 95f3ce6a77893ac828ba841df44421620de4314b ] sta_info_alloc can be called from atomic paths (such as RX path) so we need to call pcpu_alloc with the correct gfp. Fixes: c9c5962b56c1 ("mac80211: enable collecting station statistics per-CPU") Signed-off-by: Sara Sharon Signed-off-by: Luca Coelho Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- net/mac80211/sta_info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -314,7 +314,7 @@ struct sta_info *sta_info_alloc(struct i if (ieee80211_hw_check(hw, USES_RSS)) { sta->pcpu_rx_stats = - alloc_percpu(struct ieee80211_sta_rx_stats); + alloc_percpu_gfp(struct ieee80211_sta_rx_stats, gfp); if (!sta->pcpu_rx_stats) goto free; }