From patchwork Mon Mar 19 16:07:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 132051 Delivered-To: patch@linaro.org Received: by 10.80.152.129 with SMTP id j1csp2991266edb; Mon, 19 Mar 2018 09:10:08 -0700 (PDT) X-Google-Smtp-Source: AG47ELtJvgukf/f5PVNFipZOitGcPGqpOrcpkrZ90oZuVerL0t4beJvO0Ikt8w8zKsG3NWS0HOuh X-Received: by 10.99.129.199 with SMTP id t190mr9425307pgd.376.1521475807868; Mon, 19 Mar 2018 09:10:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521475807; cv=none; d=google.com; s=arc-20160816; b=s0Xd8t/svTHZ4Alf33w1zLkIHVn8/uVrk8n6uCkkHvPhxr1HQx3nxx542zfuFLd2WI lm3j2U4UbwSBdV6mgh4Pg4L1qL/oIoygyNtwdseIv/Kb5QzzzBMFjnm1ydHnZ+Nj6d1m XMTKp8rSYDhgyuk3H1D59QsiVxyb/sSpCm3uS0wQ6hc70/6ZxBwtTt3i2ljXt5cRbORE AKVBpgXrxtzJsvANLhxWDRLSnCnJQ5PL/KzGh074lcyurzplNg0yJc42cGeV5P0naUDz 9izJ9joT9/83aNo/J2n3a5Ar8jdYU36D0m1zN/npOb2NAWrVzbdFbfyjLlUWsNEUwqMz V/Jw== 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=QEi28DBxJokVh9NWeJKywBL59ZHsqKeDHFBQnW4igqo=; b=t9FOqhZB0055ZXxamiEU6CVhDICQGnJ0euXuZvWBUegpNmTHitdNe8yI8v7iz6UviH 5mNbtepwUw5HKecH2kgYopsWbrdF72Pv3n/838zrRsst3qV3sUKJ7ny6tviY5ojf+JI1 p7y96fIDg/xwpg7mSO/5bwWW5LpYW74HYnTAozLyXrABdfcuWEvuvTBQFQZ+37oLwRV1 1Z+xahRFByR+Z3qc6NvMbxaq4p0Nw3cVdkuGpBxFvINv3bjiAoO/8ALMzzkEeCPVlFyp EB4gIvG8d375gFIrdVWXZY0/KG9rSVxPaWnTj+l02qtdRBVUOHlwOcXF1GH9JY0+LwIz gqXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=b1z+ilC2; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 f5si164294pgq.806.2018.03.19.09.10.06; Mon, 19 Mar 2018 09:10:07 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-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=b1z+ilC2; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 S966407AbeCSQKF (ORCPT + 10 others); Mon, 19 Mar 2018 12:10:05 -0400 Received: from mail-sn1nam01on0103.outbound.protection.outlook.com ([104.47.32.103]:51328 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S966522AbeCSQJv (ORCPT ); Mon, 19 Mar 2018 12:09:51 -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=QEi28DBxJokVh9NWeJKywBL59ZHsqKeDHFBQnW4igqo=; b=b1z+ilC2x1Zkk7KqFlxqTgXHlmOE23Qo9qcNEUm3NdJkT+mhklUpbUzKAmASTwZcP25KytTUeJUnzkG1oHmC0zbDi1pAPaZnDZ2g2hjg/EJRDDzs2g0uyMGEWPqux1sMoGlzT2fNqJsHceJcs9Xx1mIkzoqes+61eDQS7KMgX84= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB0902.namprd21.prod.outlook.com (52.132.132.159) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.631.0; Mon, 19 Mar 2018 16:09:44 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::3d9b:79e7:94eb:5d62]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::3d9b:79e7:94eb:5d62%5]) with mapi id 15.20.0631.004; Mon, 19 Mar 2018 16:09:44 +0000 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Linus Walleij , "Reported-by : Jason Kridner" , Sasha Levin Subject: [PATCH AUTOSEL for 4.4 094/167] gpio: label descriptors using the device name Thread-Topic: [PATCH AUTOSEL for 4.4 094/167] gpio: label descriptors using the device name Thread-Index: AQHTv5xbhHKqIh7KaUW5x5q/EcBesA== Date: Mon, 19 Mar 2018 16:07:19 +0000 Message-ID: <20180319160513.16384-94-alexander.levin@microsoft.com> References: <20180319160513.16384-1-alexander.levin@microsoft.com> In-Reply-To: <20180319160513.16384-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; DM5PR2101MB0902; 7:p6Mf6DLc2PMpMFAQWR/Z+JUIsUbNxzFT+PJbJB6+RGefpfXUaMwH5dxL32EdfCp0/MhjtVntuPpVSgmKT6qGsP2S/UqvNdUDNbOEBHKVtF5kOEqDJDkXEDPnLxHKgDlnpvT3Oo5KRCbdSW4QtJ69RQInbF3SgS9SK/xcuMV8U2MAsIKWib1yZyj2PTSGD7lj+AguzCWqxW/RJBjUCIuJe0ulDYqn26XGVSJuLFooN12HXCefT/ZppRd5Of4j58KB; 20:CKD2NWvkPwd/nuJk3d2WXG5ahhdZL9qMnTF9j7t2JCOa47nd/HorAzVzYzzfDZG4F4L/yj+y+9XIhXskha6rZFhKLGG9MCP10yiygPqyQsV+jywACD3e1a8Lx/z0ulRdzLDPqjv8TtaMpOmFG+JNx0sweRWbcZYXIrscNMCOunE= x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 7dc95409-fac2-4fc5-bf42-08d58db3d46c x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020); SRVR:DM5PR2101MB0902; x-ms-traffictypediagnostic: DM5PR2101MB0902: 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); 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:DM5PR2101MB0902; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB0902; x-forefront-prvs: 06167FAD59 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(346002)(366004)(39860400002)(396003)(39380400002)(376002)(199004)(189003)(4326008)(305945005)(7736002)(66066001)(105586002)(316002)(8676002)(25786009)(8936002)(6666003)(2950100002)(5660300001)(97736004)(81166006)(81156014)(3280700002)(22452003)(99286004)(186003)(2906002)(76176011)(5250100002)(59450400001)(54906003)(10090500001)(110136005)(6116002)(2900100001)(3846002)(2501003)(1076002)(86612001)(107886003)(106356001)(6436002)(6512007)(86362001)(53936002)(6506007)(6486002)(26005)(14454004)(10290500003)(102836004)(68736007)(3660700001)(478600001)(72206003)(36756003)(22906009)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB0902; 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: BbJCFcLa8aGkpaZTYz6DHe7xTT1Nn4Z1B2AmMAmWmcW3Qx0D1xDE+Ee1Pg9hChXFVdGtFoa4TG+CdF1/SXI3WA53Ouk3Xf4I3Q5pUJOZd2Ilez8cO7JG2uXbm3JCbF2vhkfT30R2PWSTX0+RljnESC/AUn0h6E+LSUDm5kDakgdUeQy3bEEbUhhnclR1Wa+5EM6Q0SAjHCLbyweN0G1F1h2NJGviKWItXFOWReeHY9bqvRYuy0L+ZCeYNT6o9Lr3KHnEPPWGWXdipM/PNA7U1748yxpWS5IQMLIQcA9Pd570JasLhoa8D9/ltRTYb0s1OcNvedL31Owdks4AnJdSdA== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7dc95409-fac2-4fc5-bf42-08d58db3d46c X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Mar 2018 16:07:19.7326 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0902 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Linus Walleij [ Upstream commit 24e78079bf2250874e33da2e7cfbb6db72d3caf4 ] Some GPIO lines appear named "?" in the lsgpio dump due to their requesting drivers not passing a reasonable label. Most typically this happens if a device tree node just defines gpios = <...> and not foo-gpios = <...>, the former gets named "foo" and the latter gets named "?". However the struct device passed in is always valid so let's just label the GPIO with dev_name() on the device if no proper label was passed. Cc: Reported-by: Jason Kridner Reported-by: Jason Kridner Signed-off-by: Linus Walleij Signed-off-by: Sasha Levin --- drivers/gpio/gpiolib.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.14.1 diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 06d345b087f8..759a39906a52 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -2145,7 +2145,8 @@ struct gpio_desc *__must_check gpiod_get_index(struct device *dev, return desc; } - status = gpiod_request(desc, con_id); + /* If a connection label was passed use that, else use the device name as label */ + status = gpiod_request(desc, con_id ? con_id : dev_name(dev)); if (status < 0) return ERR_PTR(status); From patchwork Mon Mar 19 16:07: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: 132063 Delivered-To: patch@linaro.org Received: by 10.80.152.129 with SMTP id j1csp3059648edb; Mon, 19 Mar 2018 10:15:15 -0700 (PDT) X-Google-Smtp-Source: AG47ELuxg3exHo/y2kwRQILhSia7IFHP4ycNI2AltnNHO1sNjhs11vpOUQ6mMfweWO0pJIn60znC X-Received: by 2002:a17:902:68c2:: with SMTP id x2-v6mr4163917plm.129.1521479715415; Mon, 19 Mar 2018 10:15:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521479715; cv=none; d=google.com; s=arc-20160816; b=y2igB7nfYA1iUKUz/NW6julM9jL1cM08OwMGmvNfUEC8TUE96QLUySudwqyYSVCvF+ Ftu2HEOOv6HKhYNmI/2Q24ZHAanNV86g6XRHNs8PoDOoH72fDJba/VNuKgPGW5aDnYfn xl1BI5Ysz7hrtabF0inH1Yij+QfGhLp/HeGkJ8aURf5qxhCZSQOKjdjXTTTx9C1rpgGk bF6YY188m3TEHQ13klqr7QlNMTGGs3rgvvDebyYeEGgm+vJqe+JBeZ557gZ7ahVmPtcK OTBjIGnllG4qqj2BDYGJNwWat6OvViYLUuBArwhRyk/VxioRuVrN11N83/TD+T7ROEGZ GmHQ== 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=KP4AuA5ayVyW6WZ7m+OcJWJwc1gBJvA9I68+utMc+X4=; b=xAnU0u0++xlo7vJmg4JUA+Ti6mc5/R7jSudg6t/JK10JMKoTpSGBN0f6liXnJ7i6lj DDuem2dNWoeutzSt375FswMON4wmhN+VnKPO1rookfdLFLvCYii83vdun7qFIA/tEeCK MWyOUm8bAku6BS8oqAUzVTzzDG5we1ZQbc2YIk7iyU0/Ea6tSNZ0iSWep9PXvNKCSlZC gK5JkrkuGbxWiDBfkO59j9oIhyg5pntxSK/Mw/IyKpjjJmkVhjcrNV3wa3ZCTSvcwDY3 mNB3wqJwHezgRGyRavjND7kEZtlxbaFipWiVH5XShI8duV6EfJMdbbJ7bQJPPeqxt7wX w53g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=G+c5fQoJ; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 b34-v6si340537pld.249.2018.03.19.10.15.15; Mon, 19 Mar 2018 10:15:15 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-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=G+c5fQoJ; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 S967924AbeCSRPN (ORCPT + 10 others); Mon, 19 Mar 2018 13:15:13 -0400 Received: from mail-bn3nam01on0110.outbound.protection.outlook.com ([104.47.33.110]:35072 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S966550AbeCSQKC (ORCPT ); Mon, 19 Mar 2018 12:10:02 -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=KP4AuA5ayVyW6WZ7m+OcJWJwc1gBJvA9I68+utMc+X4=; b=G+c5fQoJZfe8gTuO34Xgdof0e2xaFGxe31BxKPbhvzF1cnA4AftH7NGa0W5DxytLdxriXUac0IPM3pSiJV3EqhXwMTmWLRBjFleAzglp8f4rVHJA5OHl5WlCoBA/G9lCCuj2i7VlwSNt3P+Du+lKus4mc+g3T5y2LcWG5YlfWpA= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB1095.namprd21.prod.outlook.com (52.132.130.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.631.0; Mon, 19 Mar 2018 16:09:53 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::3d9b:79e7:94eb:5d62]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::3d9b:79e7:94eb:5d62%5]) with mapi id 15.20.0631.004; Mon, 19 Mar 2018 16:09:53 +0000 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Will Deacon , Sasha Levin Subject: [PATCH AUTOSEL for 4.4 102/167] arm64: futex: Fix undefined behaviour with FUTEX_OP_OPARG_SHIFT usage Thread-Topic: [PATCH AUTOSEL for 4.4 102/167] arm64: futex: Fix undefined behaviour with FUTEX_OP_OPARG_SHIFT usage Thread-Index: AQHTv5xhCbJ5RYWUFkCvPOJYN+eEpQ== Date: Mon, 19 Mar 2018 16:07:29 +0000 Message-ID: <20180319160513.16384-102-alexander.levin@microsoft.com> References: <20180319160513.16384-1-alexander.levin@microsoft.com> In-Reply-To: <20180319160513.16384-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; DM5PR2101MB1095; 7:cMa6w6x60n0SEJt3J1TDEjQBgbPr4ZGeTv89I1VvL51p8OJ6o07i7IX9INAQ2eIdeJyUFeWHQljgfjzA0flxQQsqWApZA1YkF94c5UavNo654Tl7MjC8iH7QDwETg2j+EIjfFgIZUl2kV73SZCKee2Qwb0/mVBcToeF6fiqtAGAFOgIVug7CfobByS1hHb1is2Z/wUytoR9qViK1LLiQhRW+tR4/oOdausLKCpBqPjbkwu6rRGMk5ZvqHrcH1nga; 20:Q7f2B+tc5qXbFYNKr3q+Vb1O77hur8mw0v/RWr8Y242+krK6n+aOVyawbJFU4qYsxfEMwb3UniHwin7k5JfC2/EJ+iMaPZPRtwOSwo50oYjW7XKOUXNbmr+8NisUkiX5HhiM6oKCaOtPjsQbunhITSShiBmT82Q8FGU652rTnkQ= x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: b257ca6b-6e2b-4427-8c50-08d58db3da08 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020); SRVR:DM5PR2101MB1095; x-ms-traffictypediagnostic: DM5PR2101MB1095: 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)(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:DM5PR2101MB1095; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB1095; x-forefront-prvs: 06167FAD59 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(376002)(346002)(366004)(39860400002)(396003)(39380400002)(189003)(199004)(305945005)(316002)(1076002)(7736002)(14454004)(86612001)(25786009)(8936002)(2950100002)(110136005)(66066001)(186003)(10090500001)(6666003)(5250100002)(2501003)(99286004)(76176011)(86362001)(4326008)(68736007)(3660700001)(105586002)(8676002)(81166006)(81156014)(106356001)(3280700002)(72206003)(10290500003)(478600001)(2900100001)(59450400001)(97736004)(54906003)(6512007)(53936002)(6506007)(102836004)(6436002)(5660300001)(6486002)(107886003)(26005)(2906002)(22452003)(6116002)(3846002)(36756003)(22906009)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB1095; 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: h3nsgaTAgAtlOaVAamdvRCKwjyg1qGT6PwJI/bS0F8+D9xSuFPbMchq9xporlZAlKMRnZyxp2OyRsXRm8kx8VDotXfg7pnAObvFJfG+CLqnENJMyztPWpe6UDQvqNms29ACDjdwd+FSdRzcl+wA3cttbyVD6sZJ9CA4Ntx78MBsJcwtndjcdABou0Y8+Lx8//WtG+DnoE3oJOw7Kx/lmAAyi/ZMIz1s2yK1cm1qcw0+phL9jL+8vnu03H+a/T8OrNaJuuHzCTQ2PHpkkHJww7xzgBh+Z9PAFyF7TJYEBdv8FlE21G0dIhIu0P/NJZ5g77yv+hsl7qkmJnYgI9c+CbQ== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: b257ca6b-6e2b-4427-8c50-08d58db3da08 X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Mar 2018 16:07:29.6806 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1095 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Will Deacon [ Upstream commit 5f16a046f8e144c294ef98cd29d9458b5f8273e5 ] FUTEX_OP_OPARG_SHIFT instructs the futex code to treat the 12-bit oparg field as a shift value, potentially leading to a left shift value that is negative or with an absolute value that is significantly larger then the size of the type. UBSAN chokes with: -- 2.14.1 ================================================================================ UBSAN: Undefined behaviour in ./arch/arm64/include/asm/futex.h:60:13 shift exponent -1 is negative CPU: 1 PID: 1449 Comm: syz-executor0 Not tainted 4.11.0-rc4-00005-g977eb52-dirty #11 Hardware name: linux,dummy-virt (DT) Call trace: [] dump_backtrace+0x0/0x538 arch/arm64/kernel/traps.c:73 [] show_stack+0x20/0x30 arch/arm64/kernel/traps.c:228 [] __dump_stack lib/dump_stack.c:16 [inline] [] dump_stack+0x120/0x188 lib/dump_stack.c:52 [] ubsan_epilogue+0x18/0x98 lib/ubsan.c:164 [] __ubsan_handle_shift_out_of_bounds+0x250/0x294 lib/ubsan.c:421 [] futex_atomic_op_inuser arch/arm64/include/asm/futex.h:60 [inline] [] futex_wake_op kernel/futex.c:1489 [inline] [] do_futex+0x137c/0x1740 kernel/futex.c:3231 [] SYSC_futex kernel/futex.c:3281 [inline] [] SyS_futex+0x114/0x268 kernel/futex.c:3249 [] el0_svc_naked+0x24/0x28 ================================================================================ syz-executor1 uses obsolete (PF_INET,SOCK_PACKET) sock: process `syz-executor0' is using obsolete setsockopt SO_BSDCOMPAT This patch attempts to fix some of this by: * Making encoded_op an unsigned type, so we can shift it left even if the top bit is set. * Casting to signed prior to shifting right when extracting oparg and cmparg * Consider only the bottom 5 bits of oparg when using it as a left-shift value. Whilst I think this catches all of the issues, I'd much prefer to remove this stuff, as I think it's unused and the bugs are copy-pasted between a bunch of architectures. Reviewed-by: Robin Murphy Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- arch/arm64/include/asm/futex.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/include/asm/futex.h b/arch/arm64/include/asm/futex.h index 5f3ab8c1db55..f50753573989 100644 --- a/arch/arm64/include/asm/futex.h +++ b/arch/arm64/include/asm/futex.h @@ -53,16 +53,16 @@ : "memory") static inline int -futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr) +futex_atomic_op_inuser(unsigned int encoded_op, u32 __user *uaddr) { int op = (encoded_op >> 28) & 7; int cmp = (encoded_op >> 24) & 15; - int oparg = (encoded_op << 8) >> 20; - int cmparg = (encoded_op << 20) >> 20; + int oparg = (int)(encoded_op << 8) >> 20; + int cmparg = (int)(encoded_op << 20) >> 20; int oldval = 0, ret, tmp; if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28)) - oparg = 1 << oparg; + oparg = 1U << (oparg & 0x1f); if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32))) return -EFAULT; From patchwork Mon Mar 19 16:07:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 132052 Delivered-To: patch@linaro.org Received: by 10.80.152.129 with SMTP id j1csp2991766edb; Mon, 19 Mar 2018 09:10:33 -0700 (PDT) X-Google-Smtp-Source: AG47ELvX5qe2x+eg4fdfxoXi/V/Dv9/4PThUdOhE76yfsw0FXR9nYZLSfcRInDf2hrgdoltjU9y5 X-Received: by 2002:a17:902:7088:: with SMTP id z8-v6mr13102135plk.174.1521475833753; Mon, 19 Mar 2018 09:10:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521475833; cv=none; d=google.com; s=arc-20160816; b=q5T1s8IgYHwHKaKgWRfpw1tjiOjzj/FqqvF5ze6QUxCK7wTEB35xg+DjUqvKusOsva i+DYyUBThRj85jbhUcJ7Odjo7R4LxGVY/te/paC9GJ4sjK5n/achsrWAX7UEhYVlKXMf xFaPPLY0tftitm7AJi41IcKSWMTyfU17OTuGIch8fwq/DpIEINp99Z090c9LY6Iwvl8i aAIr2WEISTCXJvFIbgtOTG9AtI9oqx5X+M9Yx9qYv/QsGlBJbnRkkKoQ+EgyLtI2iccY VlQ3PdSzHDdWhQyQVcQeTi+EKDN5n0UaXtw/Yp76KB76VV+Z0QAjYHD0GJ/Yv7IK6kHg bs9g== 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=TTcIAW+hJVTgl4n22w89zRiulgGwTZc74A2aZE2Deg8=; b=vD0TgaU0GHWN89GEwZsGdXBBQ3xDnzu/ri5OQ6FscNvbMtNzNBXR1pN+FoFbOBNesJ 89XHpp63zthaq/H9q+w3/sZRseeF99aXRyfCcrhWP5GxeK639xGw1XOEoYTqwAXnVGy4 MYQDoIyZxcwX191H+uUnej5zKUtsrj9TlZTfppi20j+tps/cM2aWdh1ZQqijcDolcaDa nrH2jqizZaNTE/caEL6Yol5DzXyMwcU58r0X0bW595K9uP7SwNwW0g2K6PTBVvI+Ih4h BVNQdWcq1yW3CGbjBpkDqCq3pR0ynViFCgHZd7sfS8G6+kd/ZUch/P1h4RDKaQgW/Rj/ SEpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=DomXNwEq; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 z4si194168pfb.192.2018.03.19.09.10.33; Mon, 19 Mar 2018 09:10:33 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-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=DomXNwEq; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 S966473AbeCSQKa (ORCPT + 10 others); Mon, 19 Mar 2018 12:10:30 -0400 Received: from mail-bn3nam01on0110.outbound.protection.outlook.com ([104.47.33.110]:35072 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S966564AbeCSQKH (ORCPT ); Mon, 19 Mar 2018 12:10:07 -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=TTcIAW+hJVTgl4n22w89zRiulgGwTZc74A2aZE2Deg8=; b=DomXNwEqMZnfUXSPwS2zEpdxhOlwBfCA3evTAU+jYl6Pp88+b9fvkL742EWk39EZj8TS6mNfJYroK4Wtr3cLgME56gAuYgtTi8C2QzVbRG5wsGXtiZE8JOcX3vSRZOGdsp1WK1YHZGPIW3XHDoHm+oGvycjQTM9GJZvJfKWQG9o= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB1095.namprd21.prod.outlook.com (52.132.130.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.631.0; Mon, 19 Mar 2018 16:09:54 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::3d9b:79e7:94eb:5d62]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::3d9b:79e7:94eb:5d62%5]) with mapi id 15.20.0631.004; Mon, 19 Mar 2018 16:09:54 +0000 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Arnd Bergmann , "David S . Miller" , Sasha Levin Subject: [PATCH AUTOSEL for 4.4 103/167] net/mlx5: avoid build warning for uniprocessor Thread-Topic: [PATCH AUTOSEL for 4.4 103/167] net/mlx5: avoid build warning for uniprocessor Thread-Index: AQHTv5xiCJVGQ7qMEkuUdUomv7/K3g== Date: Mon, 19 Mar 2018 16:07:31 +0000 Message-ID: <20180319160513.16384-103-alexander.levin@microsoft.com> References: <20180319160513.16384-1-alexander.levin@microsoft.com> In-Reply-To: <20180319160513.16384-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; DM5PR2101MB1095; 7:Gn6TT9+pEkNljle7J8tCsLx26lAJlrdAsmAEXWJeuEGqml5nMXAjbT2ABlhdLSTKnC8Q+ypXCMuRPoB0yV+9d8MUN0PsdBJM3DeBN6PbmDVlOLcBP/Yz7YbY25NKGbHdnBMOLui7gQEPwx0iAcgOWTsfyDdKvxlDrjIy2nUvDF4yRtNFdd4tLpnBAtCWVo4dId0z1eJwQxfVQ0s5ZX8PLqlGCyhggKRHYofZp8ZC0jIzBjViduWu5oxTqS2ZHmAd; 20:k/ibloawdcdvhk03RBjauKzKWyheINzbV5BgIQNBqxQIfuO5dJCEUhoFrDXj5bWZtKIV9BbPpqF5blzy/tW11Q1uCD/+O2amWZwTXV/+ySDEgjcJZqJmdpBE8Pifmbu/Gvd8eAhlBmb3eT8EuS/NxLtgKyOQHgRoDYzKZ8a7iWI= x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 7784e3b1-4dc8-4458-d6d9-08d58db3da70 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020); SRVR:DM5PR2101MB1095; x-ms-traffictypediagnostic: DM5PR2101MB1095: 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); 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:DM5PR2101MB1095; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB1095; x-forefront-prvs: 06167FAD59 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(979002)(376002)(346002)(366004)(39860400002)(396003)(39380400002)(189003)(199004)(305945005)(316002)(1076002)(7736002)(14454004)(86612001)(25786009)(8936002)(2950100002)(110136005)(66066001)(186003)(10090500001)(6666003)(5250100002)(2501003)(99286004)(76176011)(86362001)(575784001)(4326008)(68736007)(3660700001)(105586002)(8676002)(81166006)(81156014)(106356001)(3280700002)(72206003)(10290500003)(478600001)(2900100001)(59450400001)(97736004)(54906003)(6512007)(53936002)(6506007)(102836004)(6436002)(5660300001)(6486002)(107886003)(26005)(2906002)(22452003)(6116002)(3846002)(36756003)(22906009)(217873001)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB1095; 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: dqhP5RW8pGVqcXiGD2YsqxmnDZfk/rYvqitV4OUFfBNW8MZ1Ia5/9RNNp3Sj19p55yDDTRRQJKvxmeJ37FX5yK6EdcP68nASAM42tJJEcA/TN3oqoqK2iiaSPjzbshRqTwJAb8eMvQVBw2wOGgLYBhEZ8tvfJJ5nOWJsJTWZfM+iXtaa4ZSHN00Xsp/o5PKXZDxlEn4evWzgLggB5IFgqyQVXfXR/5EiSrpnLxa/G5+vJ/9wWVDhfgnuTfjLhvlBj0wjWwV1LtjX5lAEYqSsGHKjjTn5tr2ERoLs5hTS4YpdE3EezubZPap/E2zM3ZuMLKhlYzxbifMtw0VJc8BIFA== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7784e3b1-4dc8-4458-d6d9-08d58db3da70 X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Mar 2018 16:07:31.3748 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1095 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann [ Upstream commit f0d7ae95fff4ab444b8433f07afc4b077ef1a285 ] Building the driver with CONFIG_SMP disabled results in a harmless warning: ethernet/mellanox/mlx5/core/main.c: In function 'mlx5_irq_set_affinity_hint': ethernet/mellanox/mlx5/core/main.c:615:6: error: unused variable 'irq' [-Werror=unused-variable] It's better to express the conditional compilation using IS_ENABLED() here, as that lets the compiler see what the intented use for the variable is, and that it can be silently discarded. Fixes: b665d98edc9a ("net/mlx5: Tolerate irq_set_affinity_hint() failures") Signed-off-by: Arnd Bergmann Acked-by: Saeed Mahameed Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/mellanox/mlx5/core/main.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- 2.14.1 diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c index 2aa42dd321e9..7c42be586be8 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c @@ -522,10 +522,9 @@ static int mlx5_irq_set_affinity_hint(struct mlx5_core_dev *mdev, int i) cpumask_set_cpu(cpumask_local_spread(i, priv->numa_node), priv->irq_info[i].mask); -#ifdef CONFIG_SMP - if (irq_set_affinity_hint(irq, priv->irq_info[i].mask)) + if (IS_ENABLED(CONFIG_SMP) && + irq_set_affinity_hint(irq, priv->irq_info[i].mask)) mlx5_core_warn(mdev, "irq_set_affinity_hint failed, irq 0x%.4x", irq); -#endif return 0; } From patchwork Mon Mar 19 16:08:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 132062 Delivered-To: patch@linaro.org Received: by 10.80.152.129 with SMTP id j1csp3049418edb; Mon, 19 Mar 2018 10:05:55 -0700 (PDT) X-Google-Smtp-Source: AG47ELugVbVlrTx/DK/jVUlgbbPR1PxkmgdkHw4XxnmVtr58iKM1aSU0iIpDJmvdaKxEDO5b08oC X-Received: by 2002:a17:902:3183:: with SMTP id x3-v6mr13273717plb.383.1521479154909; Mon, 19 Mar 2018 10:05:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521479154; cv=none; d=google.com; s=arc-20160816; b=KeQUGPVwDfoAIEqaZv2bVH9JpD/lyNBbq5tXbx3w+DFd6BCy61TUaI/boxuUsoCzTv GlChvCLgGdkj6uqAqDwnxEnCmSOTX06u2Rt8N9NKsx4m7ffSfVo7FkscmbdKAYrxW7Dq fVrfH145IbH7YN9MNoEnSoBUxTcs5t0hyuhdchb7Y3Ud/1OYVzNs2W0Gdp/VmqE5wpmw f94K18I87o98FHw9y81Z1OvuwGdPdFWP0zjwHxHhtreTevskS/hBFEQCXCYRKUKHChlU MwfaLzr99hcLiUlqtmm0pcTTD4HzSv3/ufH6CbMeMUBt7wvuygL+Upwn2QT1IgH1isUv rY0w== 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=jrElcw7FqZ9WKYkEX6lVv/ROCK1Qz+WvxzYGLDm6Zs4=; b=CVnspSAOsATfJnqgPPDTZIb+AEUGHgTgXsfnwMA3LXtgBVLc+jeUlVCBn6LefLuHLg Lz5Jsqo1idd4fPWUtGicu2mAuAgKOE7fo20Dl8klDXDaRoGdJCmfBlmOQg5myv/JPP7Q 3chZNvHY6TdwmXZ3c6+KeYYbwfX+/jqC3PHTWQdj5LFD1aaOMbcsgRCh67v4zOLg9JSz mpFq3Z2xBL2ZSITbvQ20qAUYt4Y6jha3HOUwYUduvus7hbWatUM+2J363QetkdQz4lJQ bqpwm/OZh+hzD9uB7YHxdJf2CCvFVXeKjiTwemhNkbswq3H53CSgMt6o5lB7JzfPNs5V SB3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=ldFyTSu6; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 w15-v6si308854plq.266.2018.03.19.10.05.51; Mon, 19 Mar 2018 10:05:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-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=ldFyTSu6; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 S967816AbeCSRFq (ORCPT + 10 others); Mon, 19 Mar 2018 13:05:46 -0400 Received: from mail-sn1nam02on0118.outbound.protection.outlook.com ([104.47.36.118]:57012 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S966366AbeCSQK7 (ORCPT ); Mon, 19 Mar 2018 12:10:59 -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=jrElcw7FqZ9WKYkEX6lVv/ROCK1Qz+WvxzYGLDm6Zs4=; b=ldFyTSu6dPHZFlcSOgzeOaePCXMjJ5EIGqi1w2+jpeEvNW8yt5lo5xBPeCzFZ6g1n0oekKFJIYbKlJ1bdE4/ljcM3GWT+7Kfch2QWU9zjajze15/yA6kPMdMxnED8NJE3fF/n34lKquO4bKqc4kbAsxt6s5yb7X/rhznL89dud0= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB1095.namprd21.prod.outlook.com (52.132.130.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.631.0; Mon, 19 Mar 2018 16:10:46 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::3d9b:79e7:94eb:5d62]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::3d9b:79e7:94eb:5d62%5]) with mapi id 15.20.0631.004; Mon, 19 Mar 2018 16:10:46 +0000 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Arnd Bergmann , Ian Abbott , Stefano Stabellini , Sasha Levin Subject: [PATCH AUTOSEL for 4.4 142/167] xen: avoid type warning in xchg_xen_ulong Thread-Topic: [PATCH AUTOSEL for 4.4 142/167] xen: avoid type warning in xchg_xen_ulong Thread-Index: AQHTv5yAdtO1BDdpfkGrbK/0/u58Ww== Date: Mon, 19 Mar 2018 16:08:21 +0000 Message-ID: <20180319160513.16384-142-alexander.levin@microsoft.com> References: <20180319160513.16384-1-alexander.levin@microsoft.com> In-Reply-To: <20180319160513.16384-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; DM5PR2101MB1095; 7:yhv6B/IeZGpLtBkBsShX9i+HWxhovBBfWmokp7siInJ0x+NpkjNb4Yrk9ZYggpKY8q4HOZKF8RnzmQQ8+C1Sl4hfeX9qrVWd2QFL0b7B77KW0UBj+aq6/RkXzzRgGjlHAMYvQo2RZKFNLbsPagZFHJvfLx5HxmXWF3QzdTGA6wlItfZAdw/dPfH2DmjJDo7drsW7YN0r3bEWCOKYFeD03G3slm7Iugfz7jHkbZZQ8/WlSSvzAkfAKYAk+LKfDERM; 20:2iTUakcwbBQSWEvYMXaxwLjV1lBHBAoqA5KrUK1ZQPwMuBs+5FAfQ4gJIMyJVmOAGbYCXv84dW2MadYr8VY8Rpeq5PP3wklrCKCA/qDeOjiBAvrIEtKE2zouImCXGDMLtLxFHF6cO0uZcepcyuvM+JtfUoPOeLRoC8ULvAiEF8o= x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: a4a641ca-7ac3-4c86-526e-08d58db3f930 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020); SRVR:DM5PR2101MB1095; x-ms-traffictypediagnostic: DM5PR2101MB1095: 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); 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:DM5PR2101MB1095; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB1095; x-forefront-prvs: 06167FAD59 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(376002)(346002)(366004)(39860400002)(396003)(39380400002)(189003)(199004)(305945005)(316002)(1076002)(7736002)(14454004)(86612001)(25786009)(8936002)(2950100002)(110136005)(66066001)(186003)(10090500001)(6666003)(5250100002)(2501003)(99286004)(76176011)(86362001)(4326008)(68736007)(3660700001)(105586002)(8676002)(81166006)(81156014)(106356001)(3280700002)(72206003)(10290500003)(478600001)(2900100001)(59450400001)(97736004)(54906003)(6512007)(53936002)(6506007)(102836004)(6436002)(5660300001)(6486002)(107886003)(26005)(2906002)(22452003)(6116002)(3846002)(36756003)(22906009)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB1095; 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: 26KkxD7SOD0C3bdCYGOOa3PVatzsmo+PLGiwdejrGrUnJ5NsLRkFF+iFp0oOBRpnXrlGBiSStjbVM7JHZYqmiMvY1JsyhAC2jspFV/6XphN3pwtcdCDCAyQjyA3dIIqo6qALN2SA7/7kwk0zRGFSA1vdnw0BBIoV8B3nUlnaBeBAXwgEWkEJyM6U8lBYQ8mQwxWDAL7TnpD6krH85PNdqw8pswx7GtWHffQBN+BkUsqceFlB0HyKy+h+TPAaRqLmfvrd1PL4HcBfxR3Rz++81ZvUyMy5SQNL6QS/etPwNJtsuOm9O7/tCp/dA8TK0Ne1fz9zmKNJ7PdxO4d/UCmsGA== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: a4a641ca-7ac3-4c86-526e-08d58db3f930 X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Mar 2018 16:08:21.3472 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1095 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann [ Upstream commit 9cc91f212111cdcbefa02dcdb7dd443f224bf52c ] The improved type-checking version of container_of() triggers a warning for xchg_xen_ulong, pointing out that 'xen_ulong_t' is unsigned, but atomic64_t contains a signed value: drivers/xen/events/events_2l.c: In function 'evtchn_2l_handle_events': drivers/xen/events/events_2l.c:187:1020: error: call to '__compiletime_assert_187' declared with attribute error: pointer type mismatch in container_of() This adds a cast to work around the warning. Cc: Ian Abbott Fixes: 85323a991d40 ("xen: arm: mandate EABI and use generic atomic operations.") Fixes: daa2ac80834d ("kernel.h: handle pointers to arrays better in container_of()") Signed-off-by: Arnd Bergmann Signed-off-by: Stefano Stabellini Reviewed-by: Stefano Stabellini Acked-by: Ian Abbott Signed-off-by: Sasha Levin --- arch/arm/include/asm/xen/events.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.14.1 diff --git a/arch/arm/include/asm/xen/events.h b/arch/arm/include/asm/xen/events.h index 71e473d05fcc..620dc75362e5 100644 --- a/arch/arm/include/asm/xen/events.h +++ b/arch/arm/include/asm/xen/events.h @@ -16,7 +16,7 @@ static inline int xen_irqs_disabled(struct pt_regs *regs) return raw_irqs_disabled_flags(regs->ARM_cpsr); } -#define xchg_xen_ulong(ptr, val) atomic64_xchg(container_of((ptr), \ +#define xchg_xen_ulong(ptr, val) atomic64_xchg(container_of((long long*)(ptr),\ atomic64_t, \ counter), (val))