From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-3891259-1521497035-2-13366387011946676062 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: AXB_X_FF_SEZ_S 3.299, BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='CN', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1521497034; b=grg8scF98kA4qcaGNchnHQxBJ7dzSlBMVneieVCcACTLZlv YSYvsGmX9yizEZ1JYzomSpUIfIvcUdEHypxRRLokQBeJVSvUgFKBSryq+8vCRyB/ vmjNwWjWngdE62r56nNGWc7Kqt+ESygFvcyllZcYhmrECWChzGuPWUbapxNpLAGl xcJnn7HI413kWOQH9zd8YcjkANV8k3tgt0DxEdyKDRvtOpA86nqps2VAUSiHn62Y WgF/p//gl+YgCqYNKkGHNyiKBSiQgOF4O/KRSNm6eUJ98XzuoUYcG3Fr42eS91so OnZj85IBMGHOOAdUCIYvmzqRwC6752yIfpMxj8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1521497034; bh=CRR5Bm EUjtHVbbHap3AopyMugHUFD/I3Nd3ujcBpp8o=; b=XE0hYhVA6tZeE/PQTjTyf4 KlHdsBI41YprZFUgUyDoN6xFOSKBhWHWqrGSzEYCKObWlXLs56CHXRihWB91RwCI zfBow6Kht+BL1WqIAFd9kAnhZqKZQIfR86LdgC0QgbdwxUnIJD01VmI+4ztjjHyK ZJPZF9KbsJPWhfIuQBIdSXALR/Jn0mz8Spu87IJBu+o6yXZR3HkqUDLcaMchsbvf L7xuOqT9sCqjDpBL+49QBlCS2ffdLrPnYD7xSzEcYOL0Q4k0EAb2f5xhQWVH2NnB 6aFD0RWpLjp3zH1RXPnHq13g1f0lzoAX23HHXPxJoV7qjF3ySXZFa0cOcpvqdVbA == ARC-Authentication-Results: i=1; mx5.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=Opi56nHM x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-category=clean score=-100 state=0 spamcause=gggruggvucftvghtrhhoucdtuddrgedtgedrudefgdduheejucdltddurdegtdefrddttddmucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjughrpefhvffuthffkfhfjghitgfggghsphejsehtqhertddttddunecuhfhrohhmpefurghshhgrucfnvghvihhnuceotehlvgigrghnuggvrhdrnfgvvhhinhesmhhitghrohhsohhfthdrtghomheqnecukfhppedvtdelrddufedvrddukedtrdeijedphedvrdduieekrdehgedrvdehvddpfhgvkedtmeemfegulegsmeejlegvjeemleegvggsmeehugeivdenucfrrghrrghmpehinhgvthepvddtledrudefvddrudektddrieejpdhhvghlohepvhhgvghrrdhkvghrnhgvlhdrohhrghdpmhgrihhlfhhrohhmpeeoshhtrggslhgvqdhofihnvghrsehvghgvrhdrkhgvrhhnvghlrdhorhhgqecuuefqffgjpeekuefkvffokffogfcuuffkkgfgpeejleeljeenucevlhhushhtvghrufhiiigvpeeife; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx5.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=Opi56nHM x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-category=clean score=-100 state=0 spamcause=gggruggvucftvghtrhhoucdtuddrgedtgedrudefgdduheejucdltddurdegtdefrddttddmucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjughrpefhvffuthffkfhfjghitgfggghsphejsehtqhertddttddunecuhfhrohhmpefurghshhgrucfnvghvihhnuceotehlvgigrghnuggvrhdrnfgvvhhinhesmhhitghrohhsohhfthdrtghomheqnecukfhppedvtdelrddufedvrddukedtrdeijedphedvrdduieekrdehgedrvdehvddpfhgvkedtmeemfegulegsmeejlegvjeemleegvggsmeehugeivdenucfrrghrrghmpehinhgvthepvddtledrudefvddrudektddrieejpdhhvghlohepvhhgvghrrdhkvghrnhgvlhdrohhrghdpmhgrihhlfhhrohhmpeeoshhtrggslhgvqdhofihnvghrsehvghgvrhdrkhgvrhhnvghlrdhorhhgqecuuefqffgjpeekuefkvffokffogfcuuffkkgfgpeejleeljeenucevlhhushhtvghrufhiiigvpeeife; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936278AbeCSWDC (ORCPT ); Mon, 19 Mar 2018 18:03:02 -0400 Received: from mail-by2nam03hn0244.outbound.protection.outlook.com ([104.47.42.244]:45760 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S934071AbeCSPz4 (ORCPT ); Mon, 19 Mar 2018 11:55:56 -0400 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: NeilBrown , Greg Kroah-Hartman , Sasha Levin Subject: [PATCH AUTOSEL for 4.14 52/97] staging: lustre: disable preempt while sampling processor id. Thread-Topic: [PATCH AUTOSEL for 4.14 52/97] staging: lustre: disable preempt while sampling processor id. Thread-Index: AQHTv5q2JzKRfev1QE+23ZWj6A3K2A== Date: Mon, 19 Mar 2018 15:55:35 +0000 Message-ID: <20180319155411.12348-52-alexander.levin@microsoft.com> References: <20180319155411.12348-1-alexander.levin@microsoft.com> In-Reply-To: <20180319155411.12348-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;DM5PR2101MB0967;7:yuykQd0nP729rIqnBob1Lihj79O31gVmI6mJR+YdhsCOtXVHMVnf0GonmAAiulOzdexK1OPrHFEkd1rr5zJCNjX1aycDRMTE206tO1y2FOyrB6Rnv+/F7xvHx/Zv9AKM0NKX6H+3Gz+q5aEnaQ3svR/3S52sS/FM6zq3QqYM1+yeFB9y5XjJamUzKnAiz7dqPKG1ga7zjBLU2jbSdMtXK1RYdmHSlZhragCV7glzBpmSw2yoUCZ8IxMplO5Payx2;20:IOVtqLIQsrnAMz+FQ2u3+ry+PvocHUa03rjhbD2OFQJGyvoa9NeYQsXXGuDLcLVjg5UuK+aNJYJi6uO/fTKwonvsu1YK0zUtaj0SmaVvN1xL4ENEvIkjwvt3AadI/ib/NPbwZKJnbVzRcYJB14KcEtyNcKuQk2DGjF08R2aPJRc= x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: a5f913f0-e71d-443b-8da7-08d58db1e5c0 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020);SRVR:DM5PR2101MB0967; x-ms-traffictypediagnostic: DM5PR2101MB0967: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(228905959029699)(17755550239193); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(61425038)(6040522)(2401047)(5005006)(8121501046)(3231221)(944501300)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(61426038)(61427038)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123564045)(20161123558120)(6072148)(201708071742011);SRVR:DM5PR2101MB0967;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB0967; x-forefront-prvs: 06167FAD59 x-forefront-antispam-report: SFV:SPM;SFS:(10019020)(396003)(39380400002)(376002)(39860400002)(366004)(346002)(189003)(199004)(54906003)(59450400001)(10090500001)(110136005)(5250100002)(2501003)(1076002)(6116002)(3846002)(2900100001)(99286004)(22452003)(3280700002)(186003)(2906002)(76176011)(86612001)(26005)(6486002)(10290500003)(102836004)(14454004)(36756003)(68736007)(3660700001)(72206003)(478600001)(107886003)(106356001)(53936002)(6506007)(6512007)(6436002)(86362001)(575784001)(105586002)(316002)(7736002)(4326008)(305945005)(66066001)(81156014)(81166006)(5660300001)(97736004)(8936002)(25786009)(8676002)(2950100002)(6666003)(22906009)(13693001);DIR:OUT;SFP:1501;SCL:5;SRVR:DM5PR2101MB0967;H:DM5PR2101MB1032.namprd21.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; x-microsoft-antispam-message-info: BAj6JfCEtyst/ArfP4mqQ65Zpbxc14TxAbOOm3VqcO1cS6DQcK2kzhDmotxnviOvmMZ7XClIScMmrTKPLsVeuOTKdDmtpNAFvPTswj/uLOnQsZGRXe5rLzhqrs7g+U6QJ/AAvaZQpwxPCWUm0xIy/PGwCMMR4t06aV1eIwhGHybNNyRxP00WqnZxHx2Z7M14InQycZ4mecTZsqfe2u1CxeuZ1JiRXs9aUJGRNGBuAR4erFNb5Eyrc6mhokQD79alUoHVOjHxQxSdMrgs28+J0qJGoaJI8261FHRBb81DuuvWtJp4cJanlTG5Yr93FgXgOruNdx01Qj5RijTl6wVEM+bJGcMvZuKORGpFqw+NpS/L2cDihkrtiYi1gtlGTn6+FCHMEWTOc1BOut9mtn1P9xNYZ+BQKlE2+9p09jCtl6rFLe/T334QvuynfttX0EBpcVx+iimQZJFsAPyovajLQUWEOABw8GgHmgMcMmYQlm7R04ga5jTJzX+XglkDQVNr spamdiagnosticoutput: 1:22 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: a5f913f0-e71d-443b-8da7-08d58db1e5c0 X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Mar 2018 15:55:35.0358 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0967 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: NeilBrown [ Upstream commit dbeccabf5294e80f7cc9ee566746c42211bed736 ] Calling smp_processor_id() without disabling preemption triggers a warning (if CONFIG_DEBUG_PREEMPT). I think the result of cfs_cpt_current() is only used as a hint for load balancing, rather than as a precise and stable indicator of the current CPU. So it doesn't need to be called with preemption disabled. So disable preemption inside cfs_cpt_current() to silence the warning. Signed-off-by: NeilBrown Reviewed-by: Andreas Dilger Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/staging/lustre/lnet/libcfs/linux/linux-cpu.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/staging/lustre/lnet/libcfs/linux/linux-cpu.c b/drivers= /staging/lustre/lnet/libcfs/linux/linux-cpu.c index 2da051c0d251..a4bb93b440a5 100644 --- a/drivers/staging/lustre/lnet/libcfs/linux/linux-cpu.c +++ b/drivers/staging/lustre/lnet/libcfs/linux/linux-cpu.c @@ -528,19 +528,20 @@ EXPORT_SYMBOL(cfs_cpt_spread_node); int cfs_cpt_current(struct cfs_cpt_table *cptab, int remap) { - int cpu =3D smp_processor_id(); - int cpt =3D cptab->ctb_cpu2cpt[cpu]; + int cpu; + int cpt; =20 - if (cpt < 0) { - if (!remap) - return cpt; + preempt_disable(); + cpu =3D smp_processor_id(); + cpt =3D cptab->ctb_cpu2cpt[cpu]; =20 + if (cpt < 0 && remap) { /* don't return negative value for safety of upper layer, * instead we shadow the unknown cpu to a valid partition ID */ cpt =3D cpu % cptab->ctb_nparts; } - + preempt_enable(); return cpt; } EXPORT_SYMBOL(cfs_cpt_current); --=20 2.14.1