From patchwork Mon Apr 9 00:20:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 132990 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp750084ljb; Sun, 8 Apr 2018 20:17:38 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/VtT5mhM8gZ/J7GnNT/ZwwHHhFVU2dRIplUQT4Upw5xn9Klfs6xKRlnPM2nnaScR/GT7gQ X-Received: by 10.99.153.17 with SMTP id d17mr24054427pge.62.1523243858469; Sun, 08 Apr 2018 20:17:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523243858; cv=none; d=google.com; s=arc-20160816; b=ZeuochIMCwTbBGn1cJIvwBe3K76QqZib0AT+rwz3PHq9JNGsME0Qh6Ft5i+m0Jbaxr cjt5SlGBOxbp5HtoDRR4P7ZHyBqJXSCpkYhrhi9VOZEkaQHlu7K/D1aSPYkj191N+LET 33SwS2KH3Wgubn/zXSob934jczKdMimJOlkHzc2aR7WbcMAg9Nhm2YOjgl3JcZAmwpEE ne1xdy24kM2//T1jD4O+l2LC9vAY9VKYdnl82D/hHJI+648ZvdV7PCbZsuuYTdduAvoa gtbV4OC7MF3O24QRyTRnzyoAdgrTYchTkMpOEPthqvyNyldAIu+EU3e7N6L9kyZAdAfb HBGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=hzMZY3DaNp1nbYji6bW4VPw/geV/k1dXAuXCwXMydOM=; b=sX+mSMpJplEUAB5c0wuNyAv9+FgkNm6WlxPOH9rLSq1P4X78FoaQAOBYcJsVR8/BlI gvt9pMoQKXU/BdtEFlFRouggGgLIZaO0OyskOb089Ly6yJuKEVIc+l+URT81KVsqlUPr lXQIb3Ypmt97/iH7rc142AnDMPYrUJ60n5ReKp03xjLVnvBtGobUANU66cfgMPAG268h xMa5+9pWdD/qaesICnbalZsLiUT2mxRhfPaDYWQMvxt1XK0vd5kbewzsnzbjxT05mhc8 Ahq8zVkEAT3FjGJzdJchXTh0TS8/1c544qfwV5HMTrnjsNhIYrdNNZNig13ak/x1/N2o +CAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=a4e5PNCF; 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; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b3-v6si15977469plc.63.2018.04.08.20.17.38; Sun, 08 Apr 2018 20:17:38 -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=@microsoft.com header.s=selector1 header.b=a4e5PNCF; 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; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752372AbeDIDRF (ORCPT + 29 others); Sun, 8 Apr 2018 23:17:05 -0400 Received: from mail-by2nam03on0112.outbound.protection.outlook.com ([104.47.42.112]:27929 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754794AbeDIAXf (ORCPT ); Sun, 8 Apr 2018 20:23:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=hzMZY3DaNp1nbYji6bW4VPw/geV/k1dXAuXCwXMydOM=; b=a4e5PNCF6h8SQy25mCDocFD2utBsB3nn6CD/NgKuKIoFMF+ZAQzLkmQLPkjxm+oDLiPV08Ljawgi0llm9JlcNanOVZmI/nyuYn7IfdtZrNFpChmqfA9LqBDS5YS5ITuDmQpjqpJDXb09tdhiBjd6Veq5UTzcx8/DKxWphe0shBk= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB1080.namprd21.prod.outlook.com (52.132.130.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.696.0; Mon, 9 Apr 2018 00:23:34 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8109:aef0:a777:7059]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8109:aef0:a777:7059%2]) with mapi id 15.20.0696.003; Mon, 9 Apr 2018 00:23:34 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: Arnd Bergmann , "Martin K . Petersen" , Sasha Levin Subject: [PATCH AUTOSEL for 4.14 060/161] scsi: fas216: fix sense buffer initialization Thread-Topic: [PATCH AUTOSEL for 4.14 060/161] scsi: fas216: fix sense buffer initialization Thread-Index: AQHTz5iUF8KwTdG7TEmiGGk62yKb2A== Date: Mon, 9 Apr 2018 00:20:35 +0000 Message-ID: <20180409001936.162706-60-alexander.levin@microsoft.com> References: <20180409001936.162706-1-alexander.levin@microsoft.com> In-Reply-To: <20180409001936.162706-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; DM5PR2101MB1080; 7:kRAhF0FD4cnUHx/oIQVL9AqAdlQbnymK261+hHBlSy1xRlAADNGCbqnGxd/GiS6xVhpcHrO/4nIk64Zvq1PjiyEGT47fZ41Vhhn22iiC47T0/xNOJDQdfXLeElzKObdAjS4H4w1dLfnTnJ4gi+9DgO6z2ytPaeQfgjUMD/0AmcEs6lKujB1JThdKRhmlJc7dbUNGv4FGgi+SgiYcIbwMMG4M1JlTjfOcczZaF0IIqB5FBL7HczVRX/aFoMMMAW8I; 20:zSogrR+ir0fq+N8SY8/nHB0npVIbB7MpHi2YrWkhZcnIycwNMxI3yMCqAZd/k9YJH4AjLZeDp1zXCGrKiXYvTbh8HAMDKka1GVajgFaq3Oz2svfMsKy2IrWERmeZZ24leay3SzgWL71LhJmGKziyBvqc9pVoSCnyB67bK6MDnYk= x-ms-office365-filtering-ht: Tenant X-MS-Office365-Filtering-Correlation-Id: 5fa4a2dc-8397-43ec-f79f-08d59db02153 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020); SRVR:DM5PR2101MB1080; x-ms-traffictypediagnostic: DM5PR2101MB1080: 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)(146099531331640); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040522)(2401047)(8121501046)(5005006)(10201501046)(93006095)(93001095)(3002001)(3231221)(944501327)(52105095)(6055026)(61426038)(61427038)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(6072148)(201708071742011); SRVR:DM5PR2101MB1080; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB1080; x-forefront-prvs: 0637FCE711 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(376002)(346002)(396003)(39380400002)(366004)(39860400002)(199004)(189003)(2501003)(5250100002)(8936002)(10090500001)(5660300001)(3660700001)(446003)(107886003)(14454004)(36756003)(6436002)(476003)(3280700002)(2616005)(11346002)(4326008)(53936002)(6512007)(22452003)(305945005)(10290500003)(316002)(102836004)(2906002)(6116002)(66066001)(6506007)(3846002)(7736002)(486006)(54906003)(110136005)(186003)(72206003)(26005)(1076002)(105586002)(2900100001)(6486002)(97736004)(478600001)(81156014)(81166006)(86612001)(8676002)(106356001)(99286004)(86362001)(76176011)(59450400001)(68736007)(25786009)(22906009)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB1080; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: ajrogu9gqFHWE31Y6EqB3Gn9fZ6sDgdW/xL+e4FdtqkFaDcrivwF7eDOp43aqruotMU7iEAEdqrr3E2/KVL7fJVAXCdlRNbB1OVd5iEbH1kOO6n8UKmn9ABIm7C0lvWVQNVv+F56ygXLQ9YD8EuaY/YXNOVd0mCl8Fd++S8bZV4f6kgV4CDeirTgJUEOCMOyMyLR1vdJK1kZSE6Ql4qfuheltjLI1g7O7z6Bq+w0sei8d7H4ukcwuNO5j6ZoCN/AkxiXdwPq7W/m0Lg5bJsm9KO+DueKPoIbSNrDPCmMZdYdH2I6eawk4gu90zDr3TuNlBdfbQMwBo2sorIi1OYjGIVZm0Xx3PqXKRZc2YdXeYKfzKjJDsr6XS7i9FLD7yJE1P5G1KkfvgOU1fFbBfLbAHofiN0GP0ePKYeI1ex5knY= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5fa4a2dc-8397-43ec-f79f-08d59db02153 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Apr 2018 00:20:35.0348 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1080 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnd Bergmann [ Upstream commit 96d5eaa9bb74d299508d811d865c2c41b38b0301 ] While testing with the ARM specific memset() macro removed, I ran into a compiler warning that shows an old bug: drivers/scsi/arm/fas216.c: In function 'fas216_rq_sns_done': drivers/scsi/arm/fas216.c:2014:40: error: argument to 'sizeof' in 'memset' call is the same expression as the destination; did you mean to provide an explicit length? [-Werror=sizeof-pointer-memaccess] It turns out that the definition of the scsi_cmd structure changed back in linux-2.6.25, so now we clear only four bytes (sizeof(pointer)) instead of 96 (SCSI_SENSE_BUFFERSIZE). I did not check whether we actually need to initialize the buffer here, but it's clear that if we do it, we should use the correct size. Fixes: de25deb18016 ("[SCSI] use dynamically allocated sense buffer") Signed-off-by: Arnd Bergmann Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/arm/fas216.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.15.1 diff --git a/drivers/scsi/arm/fas216.c b/drivers/scsi/arm/fas216.c index 24388795ee9a..936e8c735656 100644 --- a/drivers/scsi/arm/fas216.c +++ b/drivers/scsi/arm/fas216.c @@ -2011,7 +2011,7 @@ static void fas216_rq_sns_done(FAS216_Info *info, struct scsi_cmnd *SCpnt, * have valid data in the sense buffer that could * confuse the higher levels. */ - memset(SCpnt->sense_buffer, 0, sizeof(SCpnt->sense_buffer)); + memset(SCpnt->sense_buffer, 0, SCSI_SENSE_BUFFERSIZE); //printk("scsi%d.%c: sense buffer: ", info->host->host_no, '0' + SCpnt->device->id); //{ int i; for (i = 0; i < 32; i++) printk("%02x ", SCpnt->sense_buffer[i]); printk("\n"); } /* From patchwork Mon Apr 9 00:21:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 132946 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp641392ljb; Sun, 8 Apr 2018 17:25:35 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+wK/x8C4GJu/rE6ngXfQRCqXpYviYKLpaSN4RxTUIBkzuR6QsRMNFyinuv8CRS3yGE/L9g X-Received: by 2002:a17:902:9894:: with SMTP id s20-v6mr28452191plp.196.1523233535439; Sun, 08 Apr 2018 17:25:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523233535; cv=none; d=google.com; s=arc-20160816; b=si1f0bwRwNaZL2bk9aW1mLvo7mAYgWHlSXIXiKgzzCYosvtaTU1N1l4Oj4zkj5KxAT sdlizLNY5WOUGOlawTFMl9ZF0FR3eebADpJ2VnsXd/bQYSynEuCpnxuAJNeylD57W5bk 4pA2jw/q8WvTHmpsrV74Ct2KHE+xMG4dnK1XKaEfM0Eiq97+Ty1IhDykGFsv1nZA0dFE R/bfMOM34MRh97D1NKc6KYohR4DcObsc0r5rUn8n10SHuf5es8KdeI9HNPpmnTtSg4Tc ebcj3B4M/hBvRvXcqmjj2aNrkI4pmiQB/TzspKemUQSTNWBptonpW+1bfqKXwCbYzcQ6 2Tcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=92LPbcuP1+Nu6hJ7JSAFmsZgtoYGVkr1KtL7T+wJ5YU=; b=Cg8NwfQLIxKXzQV0VQQBuSS1KNZ+q22thVU5qFP4VLwDAa/OXk9uRruXiYW0Bg4HX4 9ZeAyfOhGOXumJ3IaAfeRcRj3mi2AeB3DmjkyveNVRPKG55bTrAqcxhYd1idj+E2YW6S Ng1J26OEsAi2JJ43lE4NGWtSexaXGIo0WkcuSGK6qMRx6qle6lk4nkgQaT6Npx2TV0w8 c//b9pqyRnZ3/O2NU8lqk5DN16xBiOa+WodlzqsJuKoCkkz57n0qi/tIm758v98u7ZOE Wfz7BzGLuVT/AKoqwnhkNVxtdVq33bT12MHmReUvSFA29oOCTrZDzbGaaY//takd6BB7 S26A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=R0ryEgil; 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; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z33-v6si16204459plb.694.2018.04.08.17.25.35; Sun, 08 Apr 2018 17:25:35 -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=@microsoft.com header.s=selector1 header.b=R0ryEgil; 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; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754314AbeDIAZa (ORCPT + 29 others); Sun, 8 Apr 2018 20:25:30 -0400 Received: from mail-bn3nam01on0112.outbound.protection.outlook.com ([104.47.33.112]:5721 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755155AbeDIAZZ (ORCPT ); Sun, 8 Apr 2018 20:25:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=92LPbcuP1+Nu6hJ7JSAFmsZgtoYGVkr1KtL7T+wJ5YU=; b=R0ryEgilroP9kJniih6EhP+EW8SKnv/GRFzoF89kGyDb00kBFJ17yLSZvTTtyxNm/lVGquRMGqwH0mrhYQ0RtekWHHUTuY64f/fyyYkqIWsARRD7tOFtawZmmONLu596diNEMhiTgxdBHQDoLUfBnHcEbAnDniHZhguxyn4Ngx8= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB1013.namprd21.prod.outlook.com (52.132.133.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.696.0; Mon, 9 Apr 2018 00:25:22 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8109:aef0:a777:7059]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8109:aef0:a777:7059%2]) with mapi id 15.20.0696.003; Mon, 9 Apr 2018 00:25:22 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: Arnd Bergmann , Thomas Gleixner , Len Brown , Andi Kleen , Nicolas Pitre , "linux-pm@vger.kernel.org" , "Rafael J. Wysocki" , Pavel Machek , Bart Van Assche , Sasha Levin Subject: [PATCH AUTOSEL for 4.14 116/161] x86/power: Fix swsusp_arch_resume prototype Thread-Topic: [PATCH AUTOSEL for 4.14 116/161] x86/power: Fix swsusp_arch_resume prototype Thread-Index: AQHTz5iziPGN6a6CTUiL7GOEJKblVw== Date: Mon, 9 Apr 2018 00:21:27 +0000 Message-ID: <20180409001936.162706-116-alexander.levin@microsoft.com> References: <20180409001936.162706-1-alexander.levin@microsoft.com> In-Reply-To: <20180409001936.162706-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; DM5PR2101MB1013; 7:NU7eYY1L9x1UIh9S87QUYtlve/KPmMKQ4OtRZdw/cR7enA1azVmntzqJNcQ+DhV7f3eNfoes3KcPtTtKKHIPI6UrbcXgn6ru0ZnI7YcJo4ojg4rVM+RviS2yKRAPI6puEIOcv2w5yATtTiSCakh6MrQOA5TrVKIfzKClmPyi0RVb1hBFezZh6sbOx54xEaeR1Bt5o/Xs/Ldhcil2rcQ/VCsSZBUioYIthwhP4YiK50LwdZrpuNpbeXSoPLhpsksA; 20:vwF6DIu2+DuS5SUymbkK1wxqwobYHCq/gfMbtGtGaJ0dMUO/RfkxYrlRAYk8uIuQ7Pty7aXS/bgEdqFMM/W3t98241LXko4v5iU5gQgbyNlLskVCqZXItDCGBgmkCkndpliCFtdBZ9d3AY8nfYlBrs8gpoopuIwVtKE8BHPyjvY= X-MS-Office365-Filtering-Correlation-Id: 9d6f50c8-239a-45d0-cd98-08d59db061e0 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(4604075)(3008032)(48565401081)(2017052603328)(7193020); SRVR:DM5PR2101MB1013; x-ms-traffictypediagnostic: DM5PR2101MB1013: 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)(9452136761055)(42068640409301)(228905959029699); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040522)(2401047)(8121501046)(5005006)(3231221)(944501327)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(61426038)(61427038)(6041310)(20161123560045)(20161123564045)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:DM5PR2101MB1013; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB1013; x-forefront-prvs: 0637FCE711 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(346002)(366004)(376002)(396003)(39860400002)(39380400002)(189003)(199004)(3280700002)(2616005)(8936002)(7736002)(476003)(446003)(11346002)(53936002)(3660700001)(86362001)(575784001)(86612001)(81156014)(2906002)(186003)(81166006)(105586002)(1076002)(8676002)(26005)(97736004)(25786009)(6306002)(6512007)(3846002)(68736007)(72206003)(106356001)(5660300001)(6486002)(6116002)(966005)(14454004)(4326008)(305945005)(6436002)(2501003)(5250100002)(10290500003)(478600001)(2900100001)(59450400001)(22452003)(110136005)(316002)(7416002)(99286004)(66066001)(10090500001)(107886003)(76176011)(102836004)(54906003)(6506007)(36756003)(486006)(22906009)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB1013; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: UxgE0R5GFWVN+GZDXH638zg3HbikgXA9t6+gV7Ce5mUM5crWutT6uGF3zCLvwLHUF/tOuOhVw+/uBgRRSYmLdJOQQPC3lkBpJbtdU9fD6oOZC8IGNxkwDR+rbDIyJuRwY0ZvDIRN7thqfUSnRYTNWzzIZUa/mGk3er9HA9mjRyVExmSkymehYlXUFHxfttVnCyNJWov9N3+h9WoCygR1ab8/jxRI4g1FVyWbLwGJrebdj+qVLDOhFG4Q88FFjnUUugGoRabO1QTYRrBiCmReX6QVXm/ZaExxFEb+0sV6qZ0IBVYEjhwVE7jutAXtrdm4e2f7blL0+VIBOpuiDSq2u73I2J9DggaR6GLlW4pYSR0gBGkD45ka731rCUMMhDFsnq1jO4AlY3GoEXK+vmZiVF3nEHdng/tYyFE5XayHUyk= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9d6f50c8-239a-45d0-cd98-08d59db061e0 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Apr 2018 00:21:27.9874 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1013 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnd Bergmann [ Upstream commit 328008a72d38b5bde6491e463405c34a81a65d3e ] The declaration for swsusp_arch_resume marks it as 'asmlinkage', but the definition in x86-32 does not, and it fails to include the header with the declaration. This leads to a warning when building with link-time-optimizations: kernel/power/power.h:108:23: error: type of 'swsusp_arch_resume' does not match original declaration [-Werror=lto-type-mismatch] extern asmlinkage int swsusp_arch_resume(void); ^ arch/x86/power/hibernate_32.c:148:0: note: 'swsusp_arch_resume' was previously declared here int swsusp_arch_resume(void) This moves the declaration into a globally visible header file and fixes up both x86 definitions to match it. Signed-off-by: Arnd Bergmann Signed-off-by: Thomas Gleixner Cc: Len Brown Cc: Andi Kleen Cc: Nicolas Pitre Cc: linux-pm@vger.kernel.org Cc: "Rafael J. Wysocki" Cc: Pavel Machek Cc: Bart Van Assche Link: https://lkml.kernel.org/r/20180202145634.200291-2-arnd@arndb.de Signed-off-by: Sasha Levin --- arch/x86/power/hibernate_32.c | 2 +- arch/x86/power/hibernate_64.c | 2 +- include/linux/suspend.h | 2 ++ kernel/power/power.h | 3 --- 4 files changed, 4 insertions(+), 5 deletions(-) -- 2.15.1 diff --git a/arch/x86/power/hibernate_32.c b/arch/x86/power/hibernate_32.c index c35fdb585c68..afc4ed7b1578 100644 --- a/arch/x86/power/hibernate_32.c +++ b/arch/x86/power/hibernate_32.c @@ -145,7 +145,7 @@ static inline void resume_init_first_level_page_table(pgd_t *pg_dir) #endif } -int swsusp_arch_resume(void) +asmlinkage int swsusp_arch_resume(void) { int error; diff --git a/arch/x86/power/hibernate_64.c b/arch/x86/power/hibernate_64.c index f910c514438f..0ef5e5204968 100644 --- a/arch/x86/power/hibernate_64.c +++ b/arch/x86/power/hibernate_64.c @@ -174,7 +174,7 @@ out: return 0; } -int swsusp_arch_resume(void) +asmlinkage int swsusp_arch_resume(void) { int error; diff --git a/include/linux/suspend.h b/include/linux/suspend.h index d60b0f5c38d5..8544357d92d0 100644 --- a/include/linux/suspend.h +++ b/include/linux/suspend.h @@ -384,6 +384,8 @@ extern int swsusp_page_is_forbidden(struct page *); extern void swsusp_set_page_free(struct page *); extern void swsusp_unset_page_free(struct page *); extern unsigned long get_safe_page(gfp_t gfp_mask); +extern asmlinkage int swsusp_arch_suspend(void); +extern asmlinkage int swsusp_arch_resume(void); extern void hibernation_set_ops(const struct platform_hibernation_ops *ops); extern int hibernate(void); diff --git a/kernel/power/power.h b/kernel/power/power.h index f29cd178df90..9e58bdc8a562 100644 --- a/kernel/power/power.h +++ b/kernel/power/power.h @@ -104,9 +104,6 @@ extern int in_suspend; extern dev_t swsusp_resume_device; extern sector_t swsusp_resume_block; -extern asmlinkage int swsusp_arch_suspend(void); -extern asmlinkage int swsusp_arch_resume(void); - extern int create_basic_memory_bitmaps(void); extern void free_basic_memory_bitmaps(void); extern int hibernate_preallocate_memory(void); From patchwork Mon Apr 9 00:21:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 132988 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp740267ljb; Sun, 8 Apr 2018 20:01:46 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+mGqKPuAjj7m7qfCCr5IdnKm6VL3r/xcEhf9z0YGh64tnIbu8lrGmRmMwVLDpt2r7gxs1S X-Received: by 2002:a17:902:bb8c:: with SMTP id m12-v6mr19240626pls.119.1523242906610; Sun, 08 Apr 2018 20:01:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523242906; cv=none; d=google.com; s=arc-20160816; b=NogUn6nFDwF1soZMsfteBSqmL4SEzy7LIc+Yxf1lEFTREU9DBuJsCb9+815INNcIyG Iao85dYkO/j2Za5sPi5Bp3v4XtzaD25ataomRU6bspIdzxW7LpqS29bG0/V9LDgx5Ere DJImO0Kgf56Oe62hpIZczZj98LjX5cAshDOmB390Kw/8LSnG9kjFvNgtk3wn99yabAtM jNSdOX3rbOJuj3ss94N+5516+8X371TAFAw75muVw0Kos1GljvwRWqQbtif/D7cKv0G6 TXogbRXU5tdaNHpyti9qzS/5KtPKTOc3ZCY4VyrIFEk1XWRhF3IrWLSGGNdZUArIk7Zt b38Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=kEbeKIWgUCGqWIDBLL4m+5ADVnQGu8x9ekPXTk31yvc=; b=FgIG78nTneeigScnNOjHd3aDgAcJQEkwClk8tlUiW1Iu2lwtb4vC/NAYdnRTzNFN1V tXY4qaptkXn1gOb2BkrB4qGuDlf9qu/CunZRgXC4HHd8yKxs24NDe3cTd+RhleiXIMEg EOUCT5g91awCzYNsDBq/KVQZn8/ZJ4uMxkJlrwOnoPr513dJ0CiUBbSEcZ9Ui+be/y3i FI1rsBv/RhGXZKwMTzCxZN4tIwagW85sR310EAUSeHu3PirIXVZPjgvRPgku69Tn1oeT YqkuWRUdmOSIreiDDySzxJ3hSvh7LveuJ1vUfN52MvscOpT02k+dqq38ytV3scswyLk3 pa+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=XT5IqOoT; 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; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c11si8191018pgw.757.2018.04.08.20.01.46; Sun, 08 Apr 2018 20:01:46 -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=@microsoft.com header.s=selector1 header.b=XT5IqOoT; 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; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752052AbeDIDBb (ORCPT + 29 others); Sun, 8 Apr 2018 23:01:31 -0400 Received: from mail-bn3nam01on0139.outbound.protection.outlook.com ([104.47.33.139]:17920 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755157AbeDIAZ3 (ORCPT ); Sun, 8 Apr 2018 20:25:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=kEbeKIWgUCGqWIDBLL4m+5ADVnQGu8x9ekPXTk31yvc=; b=XT5IqOoTn2GJ4vnHxI4AhcHpOQOT80US+Zon5P3Y8G3AlPtPsEgwvu+Quk4kPVhjbetY6lxp/40ybuzfOWju8bJXgPbwXeyYSmkLJTZY+S240mI4XTb8uJKSKE4D90lKj9ALngBpShNzMwLvdLn7uEBwVCRASfSl0kPFKDgQu30= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB1013.namprd21.prod.outlook.com (52.132.133.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.696.0; Mon, 9 Apr 2018 00:25:23 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8109:aef0:a777:7059]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8109:aef0:a777:7059%2]) with mapi id 15.20.0696.003; Mon, 9 Apr 2018 00:25:23 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: Arnd Bergmann , Thomas Gleixner , Andi Kleen , Nicolas Pitre , Peter Zijlstra , Dave Hansen , Andy Lutomirski , Josh Poimboeuf , Borislav Petkov , Vlastimil Babka , Sasha Levin Subject: [PATCH AUTOSEL for 4.14 117/161] x86/dumpstack: Avoid uninitlized variable Thread-Topic: [PATCH AUTOSEL for 4.14 117/161] x86/dumpstack: Avoid uninitlized variable Thread-Index: AQHTz5i0PincUFwi3Eis8GBTAiv9fg== Date: Mon, 9 Apr 2018 00:21:29 +0000 Message-ID: <20180409001936.162706-117-alexander.levin@microsoft.com> References: <20180409001936.162706-1-alexander.levin@microsoft.com> In-Reply-To: <20180409001936.162706-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; DM5PR2101MB1013; 7:cSyCAVsjyMkJPm+OTXwAlYPxpIEC6OKZv4B0BaX2qd4B4ElAnEoqBKBUGYSYn7bfzpikKKe/7hhat7S5StOC6czIinfZjxHvYobPy2390yzZy0IaBr84hkhs8Y2457xQYaqJ/23rgl6Sq8UaoWpICwrCd6HScXlO1xJMTpHNbFpKDX0WiYymz3twJaT6JrU7w042iycP/uG/KMcFLC0t1GlL3oMIB840HgxC7gNa+lp+fKVvZNN9JZ/GdkMkX++E; 20:3gI0xPhgFc/o20ejoRdW1OwgcuvMyo1QWwOQqH0ulRmKgWs5MmCR6j7naiO4W8PCyux6JvKaJI9YaHR73frgyDCpioGDkLFLHqrZZdT71dtUsfLdL6jVrRMQhCdqVFsLQlm+KZXCqF8dPqEi+lcdNW0NlJ+gNiWij5maf3NNE3o= X-MS-Office365-Filtering-Correlation-Id: eea326c2-7991-466c-2a60-08d59db0625f x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(4604075)(3008032)(48565401081)(2017052603328)(7193020); SRVR:DM5PR2101MB1013; x-ms-traffictypediagnostic: DM5PR2101MB1013: 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)(42068640409301)(228905959029699); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040522)(2401047)(8121501046)(5005006)(3231221)(944501327)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(61426038)(61427038)(6041310)(20161123560045)(20161123564045)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:DM5PR2101MB1013; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB1013; x-forefront-prvs: 0637FCE711 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(346002)(366004)(376002)(396003)(39860400002)(39380400002)(189003)(199004)(3280700002)(2616005)(8936002)(7736002)(476003)(446003)(11346002)(53936002)(3660700001)(86362001)(575784001)(86612001)(81156014)(2906002)(186003)(81166006)(105586002)(1076002)(8676002)(26005)(97736004)(25786009)(6306002)(6512007)(3846002)(68736007)(72206003)(106356001)(5660300001)(6486002)(6116002)(966005)(14454004)(4326008)(305945005)(6436002)(2501003)(5250100002)(10290500003)(478600001)(2900100001)(59450400001)(22452003)(110136005)(316002)(7416002)(99286004)(66066001)(10090500001)(107886003)(76176011)(102836004)(54906003)(6506007)(36756003)(486006)(22906009)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB1013; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: eENKkQZ07lkAiKnQLbJt4bUfHgLKJW8Xs3GpS875dCWBT94whU9p0peVbMZBtWzMpqCqPO/0X30lDAHRIxmKCaEkZSZkv+b9x5GyqSItk76wNjFIiWBUekJXJga1Y2T/Qzjcb35Ee/SfhblmpG8o5ltpn48H0N2hLjF26at+0ij1D5Fv6HIcUKOnzMhgAgRuowKo3+D5YUvhL9dj0W3+laBSmrtSPMzjqKL0JCfVjcdsr5+TeA28EjLgImJh372r9Qgrm7XKJe/lVnq9nQVds9TH9o4T2LjdYBPoSL9qVBHidx7Fpy0TPy92rjl4N9mRowmBtcjuWrnqJvCTGtgzcBHOoiUeqQyU3HhNZ7rSJmjHXkKwobMyYozsTjH7QdG5bKLJkYwvuxKoMvFkKZMEjSwdTTU8XNmM5M38vh5ox78= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: eea326c2-7991-466c-2a60-08d59db0625f X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Apr 2018 00:21:29.3468 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1013 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnd Bergmann [ Upstream commit ebfc15019cfa72496c674ffcb0b8ef10790dcddc ] In some configurations, 'partial' does not get initialized, as shown by this gcc-8 warning: arch/x86/kernel/dumpstack.c: In function 'show_trace_log_lvl': arch/x86/kernel/dumpstack.c:156:4: error: 'partial' may be used uninitialized in this function [-Werror=maybe-uninitialized] show_regs_if_on_stack(&stack_info, regs, partial); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ This initializes it to false, to get the previous behavior in this case. Fixes: a9cdbe72c4e8 ("x86/dumpstack: Fix partial register dumps") Signed-off-by: Arnd Bergmann Signed-off-by: Thomas Gleixner Cc: Andi Kleen Cc: Nicolas Pitre Cc: Peter Zijlstra Cc: Dave Hansen Cc: Andy Lutomirski Cc: Josh Poimboeuf Cc: Borislav Petkov Cc: Vlastimil Babka Link: https://lkml.kernel.org/r/20180202145634.200291-1-arnd@arndb.de Signed-off-by: Sasha Levin --- arch/x86/kernel/dumpstack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.15.1 diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c index afbecff161d1..a2d8a3908670 100644 --- a/arch/x86/kernel/dumpstack.c +++ b/arch/x86/kernel/dumpstack.c @@ -109,7 +109,7 @@ void show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs, struct stack_info stack_info = {0}; unsigned long visit_mask = 0; int graph_idx = 0; - bool partial; + bool partial = false; printk("%sCall Trace:\n", log_lvl); From patchwork Mon Apr 9 00:21:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 132987 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp736916ljb; Sun, 8 Apr 2018 19:56:55 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/6vJJiPh9Bn8rNNsX7grLcoIyAZm6T5rsVzXgvQjiKwXfT0U3B38BwlUBzz67kWFOKSjh3 X-Received: by 2002:a17:902:a589:: with SMTP id az9-v6mr36587045plb.283.1523242615759; Sun, 08 Apr 2018 19:56:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523242615; cv=none; d=google.com; s=arc-20160816; b=GvabBO30nCjC6hxlxkCKgDbl5cWSqbSE2LKjQR16aFECys3M4fpV+kCALkKh8vfEiq B2sg9KddAvL6WW7u77RvIO0EeM/B3tBISib6vzUB5YtjE1STgrHhp1mm0g0oJBRyaT6u GOBbsFYl2EF9Q5atHqPJhRbBMBxbRlucGTa6CEz5bwXegADnNrJp/euHi8syZcNRqCZi oZhDUF8Ppv8X0gOPCZmnsxHP1Tk97BAbt8nWe4i2gca2I3UYFlpsGZKiyXzPVHXY0Lu3 oeVYdtgUurdIT3IZoP49XCbfrq1dPHVW8u4F1jij2hemT7xkOQ80DvHPhKUiF2yDrYJp 4NFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=BlXNlAgTp9S8jEG37OcL/gYITfmNCpxgjMHumNTaHXw=; b=QRpP8efdpnJkyTnjQBnOWn25Dij50mNGaTIUDYWpACFYlvagJVg9iGE4RfNb8dT+g/ 0GoA08iaanKVLjs741cd5wk3FvyaV9BMlzxA4NHe0GDldUqNssXRB0A6vTwpmP71U6uw RacvFhreQORW+7V3AVsbrkrIMl4x4fj6/naDTrZG2xRe9yGFPaah4JAiu4UiHq/7MaAt BaVc2Nyatu+2KIJX+BcPChw433TbymsH5cfqTy3UUjUpwOXGkhDz6LW0xBRSeToM8BQg A9kDqz6WUb8uR0dibTiRi7bdiP0AMzfELExHp90AoePGpwX+doqBTmMmZ/+729H1hT+x nnyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=AZcFYk96; 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; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j10-v6si2810709plt.616.2018.04.08.19.56.55; Sun, 08 Apr 2018 19:56:55 -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=@microsoft.com header.s=selector1 header.b=AZcFYk96; 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; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755626AbeDIC4g (ORCPT + 29 others); Sun, 8 Apr 2018 22:56:36 -0400 Received: from mail-bn3nam01on0139.outbound.protection.outlook.com ([104.47.33.139]:14848 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755238AbeDIAZp (ORCPT ); Sun, 8 Apr 2018 20:25:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=BlXNlAgTp9S8jEG37OcL/gYITfmNCpxgjMHumNTaHXw=; b=AZcFYk96uBqndpUK/zSudqRJ83k479fSQyRC4pJy15+vSAfjrqVa+5FpJnqEW2gp3/xO27YrWoUSou4ZZo2FtKSlQpRJQ6RDg61zSIaleuN69e2r2Ef0n8z4j1jQy+U+2jHDLvXDwkq90oLew9cExo5MGzblZtxTPUFc89Tinds= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB1013.namprd21.prod.outlook.com (52.132.133.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.696.0; Mon, 9 Apr 2018 00:25:38 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8109:aef0:a777:7059]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8109:aef0:a777:7059%2]) with mapi id 15.20.0696.003; Mon, 9 Apr 2018 00:25:38 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: Will Deacon , Catalin Marinas , Sasha Levin Subject: [PATCH AUTOSEL for 4.14 132/161] arm64: spinlock: Fix theoretical trylock() A-B-A with LSE atomics Thread-Topic: [PATCH AUTOSEL for 4.14 132/161] arm64: spinlock: Fix theoretical trylock() A-B-A with LSE atomics Thread-Index: AQHTz5i7h+yz/e0xr063sB6Ji34vSw== Date: Mon, 9 Apr 2018 00:21:41 +0000 Message-ID: <20180409001936.162706-132-alexander.levin@microsoft.com> References: <20180409001936.162706-1-alexander.levin@microsoft.com> In-Reply-To: <20180409001936.162706-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; DM5PR2101MB1013; 7:4GYVwL0ZKLBJynwCHcJop2D7HvY3mdAd66tQnKaOJ/OhRIo9JJl9Pu+jwq6fDHWlcroPBISSrRh3/nWb9icIGMi85tM1L0XYhR0l2uXF5oS+weRv8XbH74Qgaax4fCTrUWF58TvKNZcoRHpJ8VyffDVSA/1NOM8psHdZELRiDQU/h1rPSyJpZVT2VCZhL91TtB5xznOLK4cGFS6hyJTZ6lCOJ2Vit+p5zAxY8BdqRAJ7t8azKLH4yRyet1JZZdz5; 20:thGQQ521mgPDf+dbzLfIHQRbwQWCgmO6K9fUZglt+IGCt/KZxVO3jR5buFJVNYyuOvi/eVja0NI/osInU+LWyhGYh9dqjUI+CAG/tn4grI1cJciKMCvqmsrHNQvSC3frA26NGNZtu5FaMz+4zgWm8sugH9BzKbkc21X09JNfmoo= X-MS-Office365-Filtering-Correlation-Id: a6ae9e19-711f-40f3-2739-08d59db06b76 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(4604075)(3008032)(48565401081)(2017052603328)(7193020); SRVR:DM5PR2101MB1013; x-ms-traffictypediagnostic: DM5PR2101MB1013: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(180628864354917)(89211679590171); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040522)(2401047)(8121501046)(5005006)(3231221)(944501327)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(61426038)(61427038)(6041310)(20161123560045)(20161123564045)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:DM5PR2101MB1013; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB1013; x-forefront-prvs: 0637FCE711 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(346002)(366004)(376002)(396003)(39860400002)(39380400002)(189003)(199004)(3280700002)(2616005)(8936002)(7736002)(476003)(446003)(11346002)(53936002)(3660700001)(86362001)(575784001)(86612001)(81156014)(2906002)(186003)(81166006)(105586002)(1076002)(8676002)(26005)(97736004)(25786009)(6512007)(3846002)(68736007)(72206003)(106356001)(5660300001)(6486002)(6666003)(6116002)(14454004)(4326008)(305945005)(6436002)(2501003)(5250100002)(10290500003)(478600001)(2900100001)(59450400001)(22452003)(110136005)(316002)(99286004)(66066001)(10090500001)(107886003)(76176011)(102836004)(54906003)(6506007)(36756003)(486006)(22906009)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB1013; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: 4bWFjG/yn3GsJRIfTMXjONhrMCf8d7hfRpMmgNLSfSnj/H74q+hmeMw6xKpxw6Mn9saqvXNJeX2CkY5ZsnQ/SnrE3h4XwkwRt+dZJj8jG78/q/WlOE1YOawjuY+J4lhVc8sgGB/y5Tbhhd7p8VBH4k81ic0Eym9gZEE/AkxmFZFzpBPInXMm6l+nc/xv0AxTB+RPdKAepovqDLjLEYoHsII8zBaZp1lwUzDops/P2+cAB7oMhtvxsxDLQU11Ku/zs6JVvkc9sL7dL85rtnVeAMamFvSYr2m+bDTrylkVsngZNjQCHzNcFDVDKLKbV4TRDbr3wH8TnUe6+CLkLCTPVdjsyakCE/XOZQVHWpLkBAU6/hjJrLknNmTXNwrJDiozAignNNsZmP0f2mDYW5hKYLI3ztnskDwKSAdRfK/43Io= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: a6ae9e19-711f-40f3-2739-08d59db06b76 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Apr 2018 00:21:41.3624 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1013 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Will Deacon [ Upstream commit 202fb4ef81e3ec765c23bd1e6746a5c25b797d0e ] If the spinlock "next" ticket wraps around between the initial LDR and the cmpxchg in the LSE version of spin_trylock, then we can erroneously think that we have successfuly acquired the lock because we only check whether the next ticket return by the cmpxchg is equal to the owner ticket in our updated lock word. This patch fixes the issue by performing a full 32-bit check of the lock word when trying to determine whether or not the CASA instruction updated memory. Reported-by: Catalin Marinas Signed-off-by: Will Deacon Signed-off-by: Catalin Marinas Signed-off-by: Sasha Levin --- arch/arm64/include/asm/spinlock.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.15.1 diff --git a/arch/arm64/include/asm/spinlock.h b/arch/arm64/include/asm/spinlock.h index 95ad7102b63c..82375b896be5 100644 --- a/arch/arm64/include/asm/spinlock.h +++ b/arch/arm64/include/asm/spinlock.h @@ -89,8 +89,8 @@ static inline int arch_spin_trylock(arch_spinlock_t *lock) " cbnz %w1, 1f\n" " add %w1, %w0, %3\n" " casa %w0, %w1, %2\n" - " and %w1, %w1, #0xffff\n" - " eor %w1, %w1, %w0, lsr #16\n" + " sub %w1, %w1, %3\n" + " eor %w1, %w1, %w0\n" "1:") : "=&r" (lockval), "=&r" (tmp), "+Q" (*lock) : "I" (1 << TICKET_SHIFT) From patchwork Mon Apr 9 00:21:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 132947 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp641850ljb; Sun, 8 Apr 2018 17:26:21 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+750tDhvQG/tvIQD5H6aC03UI1KfZw0qn6jdxj+FCgScvF7VGdJq7oZ+i6HMjOOmnqzkx1 X-Received: by 2002:a17:902:5581:: with SMTP id g1-v6mr5862816pli.351.1523233581330; Sun, 08 Apr 2018 17:26:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523233581; cv=none; d=google.com; s=arc-20160816; b=owZ7aJDGomboEtBZKD4SOOMOASlxbAth545mV1SACZnp3U+rG9FFb08LBDLi4wDcBo Qk7EPlXRx1UAuzwlxafviA6x/w6gufbVs00E+5Yvk/n9ofTRnSnwzPauttBFRUqZiqXb g8YQX3S9gTGIHNgRiooynv2g3SOU4MCYo/NdQWUpV0iVDNva2qK3ikN9gecenn4c8kOn YuA5xJSuLAPtyeRRi5+RuHn3BN6ed3u+X+yCLzM0DKHA4ULEXWwXNa24RL7zHzPem39W 78USbKwWwtjdWm512FXAsmqZNZPZmm/qrObtzKxMwBVXTTOdEaP6YUDgC3PGId+omZje pwcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=1mmgCQVKYJ8unkZxMp+zJXj6A4XQ1G7IVwhrwBSjv8Y=; b=jwTrDEUwQwK1l6z/kU1UHJN1IbnmyRmCoCrlAq3EQCRjz7wxSrhurKBZaW0VOMqnQ1 vs39BBkj2FBz9s31gCFRmJyIUKs1G9cMmKu5etVSWjWC6sxiUZUgJHNqlfytIrHcnVjJ xmsyi4Pk91cen7UCKa44+qP9rvhYeCv4jJ8QGnofx2PQ/HGauaL4Ug0vWeh5tJsm5lPz xu5USFMJYfAS0gr+rLq4gdo7k51g3bPIU9pKzKS8neXs9e/YwC3uk7voBSw7okhtBlCY D0qv3vz1N7NHSHQtl+/zbpkxUWcKftjy3/LPXsDm4CiDoGSuwCNScNwMszM4u5SKhd1s kCxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=kWS1rpxt; 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; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k1-v6si13101351pld.267.2018.04.08.17.26.21; Sun, 08 Apr 2018 17:26:21 -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=@microsoft.com header.s=selector1 header.b=kWS1rpxt; 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; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755304AbeDIA0S (ORCPT + 29 others); Sun, 8 Apr 2018 20:26:18 -0400 Received: from mail-bn3nam01on0132.outbound.protection.outlook.com ([104.47.33.132]:42561 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755262AbeDIAZt (ORCPT ); Sun, 8 Apr 2018 20:25:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=1mmgCQVKYJ8unkZxMp+zJXj6A4XQ1G7IVwhrwBSjv8Y=; b=kWS1rpxtO3Pil/21SDKrspLou2+Y5pCjXVhhWj2aNY1UGpwaHL7vCwjYmapEA9INMz2mq1+j0wYNoHmT+JHTgnf4a/xgczhcn6R8W1ClZF4pXruEbXFLoXN1hmdPkbTqkczxirHU3Z227fVOyBG97bU/3619ZhmVShW3UT8H9E4= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB1013.namprd21.prod.outlook.com (52.132.133.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.696.0; Mon, 9 Apr 2018 00:25:40 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8109:aef0:a777:7059]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8109:aef0:a777:7059%2]) with mapi id 15.20.0696.003; Mon, 9 Apr 2018 00:25:40 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: Arnd Bergmann , Steve French , Sasha Levin Subject: [PATCH AUTOSEL for 4.14 135/161] cifs: silence compiler warnings showing up with gcc-8.0.0 Thread-Topic: [PATCH AUTOSEL for 4.14 135/161] cifs: silence compiler warnings showing up with gcc-8.0.0 Thread-Index: AQHTz5i9G1xFGP1bU0qf/biXd0eR6w== Date: Mon, 9 Apr 2018 00:21:43 +0000 Message-ID: <20180409001936.162706-135-alexander.levin@microsoft.com> References: <20180409001936.162706-1-alexander.levin@microsoft.com> In-Reply-To: <20180409001936.162706-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; DM5PR2101MB1013; 7:agcs5cjZrIZRBWhey2G+ilXRQ4UKGT9D38ecx3CDfFClk5H1Ge5BSt3B4a5+DDFJTmsqd/sI3dDwxHIzzZ9CgIwI7vSpdjtxtLxZTb+t8PAhq61V/yX32Ijl2vDKtoRp0prMdmAvwOS4rNLHo+G8ENWqkkMoq1TEgPpyP/YmNfBnuWFwDqYbcIleKyTMQUqSNk5Ed5GNJbUIjvFfHkbqx9hcebDwCCtscRhkgNChn4HPJ+ZHBgWZpVSFEzGbrc4s; 20:a8fHW5Z8rRCB46eRBEz+6mCKRguoxVYoATOFhXZ0k7iJv4CxfjpMTWa1PlhqhJIfFRtWKXjek3tXzV+5JkM4lFMzAem5SwgO4/WcOZPIf5Wgbip80Mp4DdFlTYlNHhKk1SPa3/dV16BE6jBmjHh3QTUqRR0kPiUuwfighQstqAE= X-MS-Office365-Filtering-Correlation-Id: cdb78d27-07df-40b6-3094-08d59db06c62 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(4604075)(3008032)(48565401081)(2017052603328)(7193020); SRVR:DM5PR2101MB1013; x-ms-traffictypediagnostic: DM5PR2101MB1013: 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)(85827821059158); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040522)(2401047)(8121501046)(5005006)(3231221)(944501327)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(61426038)(61427038)(6041310)(20161123560045)(20161123564045)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:DM5PR2101MB1013; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB1013; x-forefront-prvs: 0637FCE711 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(346002)(366004)(376002)(396003)(39860400002)(39380400002)(189003)(199004)(3280700002)(2616005)(8936002)(7736002)(476003)(446003)(11346002)(53936002)(3660700001)(86362001)(86612001)(81156014)(2906002)(186003)(81166006)(105586002)(1076002)(8676002)(26005)(97736004)(25786009)(6512007)(3846002)(68736007)(72206003)(106356001)(5660300001)(6486002)(6116002)(14454004)(4326008)(305945005)(6436002)(2501003)(5250100002)(10290500003)(478600001)(2900100001)(22452003)(110136005)(39060400002)(316002)(99286004)(66066001)(10090500001)(107886003)(76176011)(102836004)(54906003)(6506007)(36756003)(486006)(22906009)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB1013; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: x4CETqKwm/b88bAjVh5bKSxs86rbDaAyDRbKS0Zc/eX3sfEFegR0t7ieKzZ+0Sh7LhnmVuFuVJS4rYi/P3h1PPKeztxQMPpmdQW2Zwj9H5Lfzu+uT4+ucq9V63YVRUOcQdNw/dzK6QiqCnz+Yoh8yHAuUm0F7ZixAREFLcZnDPUyTYryrUQpvwWBRTjcCAI3x4OK6zB1Kn0Dm8PWZ6RFrGOYWNLU6VOwEtmcD9Upaip9AV/qxed4kKEEdQh9rMi1qNx4oekOWylimMkvKwYkJ4kRBdMrrZiGW0hplWnplOmur934TJtTbVNLkdfZin2tmsyeijJwKpfq6n/gm/hlFY8KleivhZB6etkmwmggR1h+TVOl1sKHCJpRjNgYRGkj78/omSi52WHEPkqXRyT7QSv6cMHrmtWP7SfFeFU9x7A= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: cdb78d27-07df-40b6-3094-08d59db06c62 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Apr 2018 00:21:43.8936 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1013 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnd Bergmann [ Upstream commit ade7db991b47ab3016a414468164f4966bd08202 ] This bug was fixed before, but came up again with the latest compiler in another function: fs/cifs/cifssmb.c: In function 'CIFSSMBSetEA': fs/cifs/cifssmb.c:6362:3: error: 'strncpy' offset 8 is out of the bounds [0, 4] [-Werror=array-bounds] strncpy(parm_data->list[0].name, ea_name, name_len); Let's apply the same fix that was used for the other instances. Fixes: b2a3ad9ca502 ("cifs: silence compiler warnings showing up with gcc-4.7.0") Signed-off-by: Arnd Bergmann Signed-off-by: Steve French Signed-off-by: Sasha Levin --- fs/cifs/cifssmb.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- 2.15.1 diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c index 35dc5bf01ee2..7fd39ea6e22e 100644 --- a/fs/cifs/cifssmb.c +++ b/fs/cifs/cifssmb.c @@ -6331,9 +6331,7 @@ SetEARetry: pSMB->InformationLevel = cpu_to_le16(SMB_SET_FILE_EA); - parm_data = - (struct fealist *) (((char *) &pSMB->hdr.Protocol) + - offset); + parm_data = (void *)pSMB + offsetof(struct smb_hdr, Protocol) + offset; pSMB->ParameterOffset = cpu_to_le16(param_offset); pSMB->DataOffset = cpu_to_le16(offset); pSMB->SetupCount = 1; From patchwork Mon Apr 9 00:22:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 132984 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp732887ljb; Sun, 8 Apr 2018 19:50:10 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/UzU4spSeZHhBNkAv+FuhaquhiGgVUc4IUSkTs4D1BP/kmKdj2LiBoxeh1WM/d5PGPIOR5 X-Received: by 10.99.115.84 with SMTP id d20mr23828627pgn.362.1523242210568; Sun, 08 Apr 2018 19:50:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523242210; cv=none; d=google.com; s=arc-20160816; b=ccYGtbWPtJeLEmzcQzzgDB1RbQBPeAQfB03MdSIw/GyBtHuUqtm5PLwhdp4Qk7qCEs 7d8Dv+yiNpaPYda9LyZL93buZfiRSDBpKC56pYXzgY3d+5mjYrvcpEbyy9cdzg6WlPdM a51LheUyEE3c/9Hu2/M2gQFRnO85XGFqBgh946Lk4or5Kmzd/xCcTYpQiCM5nehLtN3W oamz4Cpi++QSqnTn4CgJyPJu8RZpXTo8rs+Gcx/4qz0SCU8ikdPM93KmrMw6pTCy4TGP 1H1cWQu12G2b9SF1DjN+3DAk1QTwLxgC4oqUwn7cnUiNkubpqBxPz6gEphGBvcTBwkw8 Y1Sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=/2Q7BDTX5laciXSJBEK8RmhsqJ1fdR/6W6U9pYji35s=; b=0h0+71wqe/UPB42bXpSNYAmVeQQgUKaHkuj6JrJ+p6eTtsY36vrEYHwLit6F91xdCv G/5xVDxbBGlml/nj2VpaJzYkOfoswVV+E4212iSLMCp7EqXE3GRj79gzYIoVG0FzJ6Fy zVSTJU9He6eil6uW56zHovlloQN8A2ktwB9axnmxW4eKhXWJXqs/66qzsEO78DDpzxn4 ZqFSHccRVlfLo4G1PRhbmSr6FkwyQNRdHA/pYccqVigq+7b8Do76BeT6CmqyjQr/kGI6 afnnxxY7wCNahHJwnSJJRKux4BQ3T959VV7MOh18LGcGvAFE+ftSKPRcFKCpVS1jk5+I H8hQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=OuVTe6DH; 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; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t6-v6si3137969plz.27.2018.04.08.19.50.10; Sun, 08 Apr 2018 19:50:10 -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=@microsoft.com header.s=selector1 header.b=OuVTe6DH; 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; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933256AbeDICuF (ORCPT + 29 others); Sun, 8 Apr 2018 22:50:05 -0400 Received: from mail-by2nam01on0099.outbound.protection.outlook.com ([104.47.34.99]:2811 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755360AbeDIA0e (ORCPT ); Sun, 8 Apr 2018 20:26:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=/2Q7BDTX5laciXSJBEK8RmhsqJ1fdR/6W6U9pYji35s=; b=OuVTe6DH7xR7EXqYRQVyLSdo1b9nqOazHewN9ZR+rsIQAsfJqgLhu5W/UljGVhuybPwvBLHg1Oa+2SFH34z6x4jfqlNr+zGcuJYm8VjoGW6wjHWWcJ/Y/19ejwUajCGbLTC8qwHwCnHeX6R8/7RTqS9p4dIX3jEsSa+hUn9y350= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB1015.namprd21.prod.outlook.com (52.132.133.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.696.0; Mon, 9 Apr 2018 00:26:28 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8109:aef0:a777:7059]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8109:aef0:a777:7059%2]) with mapi id 15.20.0696.003; Mon, 9 Apr 2018 00:26:28 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: Mark Salter , Marc Zyngier , Sasha Levin Subject: [PATCH AUTOSEL for 4.14 161/161] irqchip/gic-v3: Change pr_debug message to pr_devel Thread-Topic: [PATCH AUTOSEL for 4.14 161/161] irqchip/gic-v3: Change pr_debug message to pr_devel Thread-Index: AQHTz5jLRCly1kzllk2wGeDYrsUfxQ== Date: Mon, 9 Apr 2018 00:22:07 +0000 Message-ID: <20180409001936.162706-161-alexander.levin@microsoft.com> References: <20180409001936.162706-1-alexander.levin@microsoft.com> In-Reply-To: <20180409001936.162706-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; DM5PR2101MB1015; 7:B53CpvK+WjtFJPhGxozLjphx0nPVK2OShtaWlPjq7NMEHjaqzhobPIsWjlrHmQQQhwpyMWIItWDvKYMCNkF+6+C4vv7Z/kX2XOL6UPiXXmkC1JZFfGgNdTH2yScvjqx7BtT26T/hpQMmueBOlVL4NybV873Bt38I54/YnG22nUUNSLM5OjwQWLqPkAW01zpcXJR+MC3qu93jzKrcUTF8dRyzporlpeA10a/tNxW88ZHSZ6f5RWekVz4ajj4nODh7; 20:Xq8/PgX0NCLXyXzaqwW7LZdVLn6RZnePMbDZ4k0atGbMvohlMv5bdNC90TalEuJ62stvqLqjKlr7Ox0XvXFNbG7OFTwSfErO9Zuhi0zYRVtcDMiKDQY5nZU8lqVHIezxLvXHAYUGFZY4WhG4rKiazWYdYFEnVPn03mM2EuzTDkI= x-ms-office365-filtering-ht: Tenant X-MS-Office365-Filtering-Correlation-Id: 7e6907b3-1a84-4181-9c21-08d59db08981 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020); SRVR:DM5PR2101MB1015; x-ms-traffictypediagnostic: DM5PR2101MB1015: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(180628864354917)(89211679590171); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040522)(2401047)(8121501046)(5005006)(3231221)(944501327)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(61426038)(61427038)(6041310)(20161123560045)(20161123564045)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:DM5PR2101MB1015; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB1015; x-forefront-prvs: 0637FCE711 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(396003)(39860400002)(39380400002)(376002)(346002)(366004)(189003)(199004)(53936002)(4326008)(478600001)(72206003)(3280700002)(2616005)(14454004)(305945005)(5250100002)(3660700001)(2501003)(2900100001)(54906003)(110136005)(86362001)(1076002)(107886003)(6506007)(36756003)(446003)(68736007)(6512007)(7736002)(486006)(2906002)(15650500001)(5660300001)(6436002)(3846002)(86612001)(6486002)(66066001)(11346002)(476003)(6666003)(59450400001)(26005)(10090500001)(316002)(22452003)(8676002)(81156014)(81166006)(6116002)(105586002)(99286004)(186003)(106356001)(76176011)(25786009)(97736004)(10290500003)(102836004)(8936002)(22906009)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB1015; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: 1oTQ1iwLYpojFCM7HRsQFBqr9J247EKoUWmbNs6mvvWeSZ9h6L1gtlNyJd38eQ3OpvhLaCDOV7ETgT/qlsMXQlb+bjxVvXg2XGkxEfNLSVsPEb3QnJ1kGRnsHlFCeQuQjqZ2XKGPQYCcQy7HD4LNoHsdqsila95RJuObc50v4XBvDeaVXr4r7+wLp2oMOnbUxTVz7/AgnpryPt1kYxSXLV+N03yi9lbyELaXfoA5purAiAwphASQGSM83tduWwfkzSgMTYfkV5BdatcOJZ0yauVudDQoBdT9Fiy0IjuJ/OpoxJdsFIGCQg2gaXBq49PtAfVSer5yWRh8c9DVDRaVAQapCnenntC6C7A9q0Yb/5NkHqKxciJPt8jzVN48KxjCCe0Nwk7Hnh2vK6gTlNLwOMMMroRrf5thX5F9drmJmVs= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7e6907b3-1a84-4181-9c21-08d59db08981 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Apr 2018 00:22:07.7997 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1015 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mark Salter [ Upstream commit b6dd4d83dc2f78cebc9a7e6e7e4bc2be4d29b94d ] The pr_debug() in gic-v3 gic_send_sgi() can trigger a circular locking warning: GICv3: CPU10: ICC_SGI1R_EL1 5000400 ====================================================== WARNING: possible circular locking dependency detected 4.15.0+ #1 Tainted: G W ------------------------------------------------------ dynamic_debug01/1873 is trying to acquire lock: ((console_sem).lock){-...}, at: [<0000000099c891ec>] down_trylock+0x20/0x4c but task is already holding lock: (&rq->lock){-.-.}, at: [<00000000842e1587>] __task_rq_lock+0x54/0xdc which lock already depends on the new lock. the existing dependency chain (in reverse order) is: -> #2 (&rq->lock){-.-.}: __lock_acquire+0x3b4/0x6e0 lock_acquire+0xf4/0x2a8 _raw_spin_lock+0x4c/0x60 task_fork_fair+0x3c/0x148 sched_fork+0x10c/0x214 copy_process.isra.32.part.33+0x4e8/0x14f0 _do_fork+0xe8/0x78c kernel_thread+0x48/0x54 rest_init+0x34/0x2a4 start_kernel+0x45c/0x488 -> #1 (&p->pi_lock){-.-.}: __lock_acquire+0x3b4/0x6e0 lock_acquire+0xf4/0x2a8 _raw_spin_lock_irqsave+0x58/0x70 try_to_wake_up+0x48/0x600 wake_up_process+0x28/0x34 __up.isra.0+0x60/0x6c up+0x60/0x68 __up_console_sem+0x4c/0x7c console_unlock+0x328/0x634 vprintk_emit+0x25c/0x390 dev_vprintk_emit+0xc4/0x1fc dev_printk_emit+0x88/0xa8 __dev_printk+0x58/0x9c _dev_info+0x84/0xa8 usb_new_device+0x100/0x474 hub_port_connect+0x280/0x92c hub_event+0x740/0xa84 process_one_work+0x240/0x70c worker_thread+0x60/0x400 kthread+0x110/0x13c ret_from_fork+0x10/0x18 -> #0 ((console_sem).lock){-...}: validate_chain.isra.34+0x6e4/0xa20 __lock_acquire+0x3b4/0x6e0 lock_acquire+0xf4/0x2a8 _raw_spin_lock_irqsave+0x58/0x70 down_trylock+0x20/0x4c __down_trylock_console_sem+0x3c/0x9c console_trylock+0x20/0xb0 vprintk_emit+0x254/0x390 vprintk_default+0x58/0x90 vprintk_func+0xbc/0x164 printk+0x80/0xa0 __dynamic_pr_debug+0x84/0xac gic_raise_softirq+0x184/0x18c smp_cross_call+0xac/0x218 smp_send_reschedule+0x3c/0x48 resched_curr+0x60/0x9c check_preempt_curr+0x70/0xdc wake_up_new_task+0x310/0x470 _do_fork+0x188/0x78c SyS_clone+0x44/0x50 __sys_trace_return+0x0/0x4 other info that might help us debug this: Chain exists of: (console_sem).lock --> &p->pi_lock --> &rq->lock Possible unsafe locking scenario: CPU0 CPU1 ---- ---- lock(&rq->lock); lock(&p->pi_lock); lock(&rq->lock); lock((console_sem).lock); *** DEADLOCK *** 2 locks held by dynamic_debug01/1873: #0: (&p->pi_lock){-.-.}, at: [<000000001366df53>] wake_up_new_task+0x40/0x470 #1: (&rq->lock){-.-.}, at: [<00000000842e1587>] __task_rq_lock+0x54/0xdc stack backtrace: CPU: 10 PID: 1873 Comm: dynamic_debug01 Tainted: G W 4.15.0+ #1 Hardware name: GIGABYTE R120-T34-00/MT30-GS2-00, BIOS T48 10/02/2017 Call trace: dump_backtrace+0x0/0x188 show_stack+0x24/0x2c dump_stack+0xa4/0xe0 print_circular_bug.isra.31+0x29c/0x2b8 check_prev_add.constprop.39+0x6c8/0x6dc validate_chain.isra.34+0x6e4/0xa20 __lock_acquire+0x3b4/0x6e0 lock_acquire+0xf4/0x2a8 _raw_spin_lock_irqsave+0x58/0x70 down_trylock+0x20/0x4c __down_trylock_console_sem+0x3c/0x9c console_trylock+0x20/0xb0 vprintk_emit+0x254/0x390 vprintk_default+0x58/0x90 vprintk_func+0xbc/0x164 printk+0x80/0xa0 __dynamic_pr_debug+0x84/0xac gic_raise_softirq+0x184/0x18c smp_cross_call+0xac/0x218 smp_send_reschedule+0x3c/0x48 resched_curr+0x60/0x9c check_preempt_curr+0x70/0xdc wake_up_new_task+0x310/0x470 _do_fork+0x188/0x78c SyS_clone+0x44/0x50 __sys_trace_return+0x0/0x4 GICv3: CPU0: ICC_SGI1R_EL1 12000 This could be fixed with printk_deferred() but that might lessen its usefulness for debugging. So change it to pr_devel to keep it out of production kernels. Developers working on gic-v3 can enable it as needed in their kernels. Signed-off-by: Mark Salter Signed-off-by: Marc Zyngier Signed-off-by: Sasha Levin --- drivers/irqchip/irq-gic-v3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.15.1 diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c index ae9ff72e83ee..4d4d46dc1a6d 100644 --- a/drivers/irqchip/irq-gic-v3.c +++ b/drivers/irqchip/irq-gic-v3.c @@ -645,7 +645,7 @@ static void gic_send_sgi(u64 cluster_id, u16 tlist, unsigned int irq) MPIDR_TO_SGI_AFFINITY(cluster_id, 1) | tlist << ICC_SGI1R_TARGET_LIST_SHIFT); - pr_debug("CPU%d: ICC_SGI1R_EL1 %llx\n", smp_processor_id(), val); + pr_devel("CPU%d: ICC_SGI1R_EL1 %llx\n", smp_processor_id(), val); gic_write_sgi1r(val); }