From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1D695C33CAF for ; Thu, 16 Jan 2020 17:30:31 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E3D4B24713 for ; Thu, 16 Jan 2020 17:30:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="PeIDTAum" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E3D4B24713 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1is8y8-0001As-6V; Thu, 16 Jan 2020 17:30:08 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1is8y6-00011F-Mg for xen-devel@lists.xenproject.org; Thu, 16 Jan 2020 17:30:06 +0000 X-Inumbo-ID: d5e44506-3885-11ea-a2eb-bc764e2007e4 Received: from mail.kernel.org (unknown [198.145.29.99]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id d5e44506-3885-11ea-a2eb-bc764e2007e4; Thu, 16 Jan 2020 17:30:06 +0000 (UTC) Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D303324721; Thu, 16 Jan 2020 17:30:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579195805; bh=GqT+VFCz0fjwLD0nspadbZFk3K0CQrDFdoHxecWoKJY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PeIDTAum8YvyOGvNSCbuMlKUy5AFa40ICcUYOI67uU4Q84F0BEKzwXfbq9iJoX1jM +Rg78qkTTtdpyKDSG/yy0DL+lJFwR8pdH3f7F40GHXUo4vQgt0DzwDQu/0vk87cQ8S Ob1AtOQcePEfcsb0fc2blqrN8moiXuigs+XD6BGE= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Date: Thu, 16 Jan 2020 12:23:11 -0500 Message-Id: <20200116172403.18149-262-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116172403.18149-1-sashal@kernel.org> References: <20200116172403.18149-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Subject: [Xen-devel] [PATCH AUTOSEL 4.14 319/371] net: add {READ|WRITE}_ONCE() annotations on ->rskq_accept_head X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Sasha Levin , xen-devel@lists.xenproject.org, Eric Dumazet , Jakub Kicinski , netdev@vger.kernel.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" RnJvbTogRXJpYyBEdW1hemV0IDxlZHVtYXpldEBnb29nbGUuY29tPgoKWyBVcHN0cmVhbSBjb21t aXQgNjBiMTczY2EzZDFjZDE3ODJiZDAwOTZkYzE3Mjk4ZWMyNDJmNmZiMSBdCgpyZXFza19xdWV1 ZV9lbXB0eSgpIGlzIGNhbGxlZCBmcm9tIGluZXRfY3NrX2xpc3Rlbl9wb2xsKCkgd2hpbGUKb3Ro ZXIgY3B1cyBtaWdodCB3cml0ZSAtPnJza3FfYWNjZXB0X2hlYWQgdmFsdWUuCgpVc2Uge1JFQUR8 V1JJVEV9X09OQ0UoKSB0byBhdm9pZCBjb21waWxlciB0cmlja3MKYW5kIHBvdGVudGlhbCBLQ1NB TiBzcGxhdHMuCgpGaXhlczogZmZmMWYzMDAxY2M1ICgidGNwOiBhZGQgYSBzcGlubG9jayB0byBw cm90ZWN0IHN0cnVjdCByZXF1ZXN0X3NvY2tfcXVldWUiKQpTaWduZWQtb2ZmLWJ5OiBFcmljIER1 bWF6ZXQgPGVkdW1hemV0QGdvb2dsZS5jb20+ClNpZ25lZC1vZmYtYnk6IEpha3ViIEtpY2luc2tp IDxqYWt1Yi5raWNpbnNraUBuZXRyb25vbWUuY29tPgpTaWduZWQtb2ZmLWJ5OiBTYXNoYSBMZXZp biA8c2FzaGFsQGtlcm5lbC5vcmc+Ci0tLQogZHJpdmVycy94ZW4vcHZjYWxscy1iYWNrLmMgICAg ICB8IDIgKy0KIGluY2x1ZGUvbmV0L3JlcXVlc3Rfc29jay5oICAgICAgfCA0ICsrLS0KIG5ldC9p cHY0L2luZXRfY29ubmVjdGlvbl9zb2NrLmMgfCAyICstCiAzIGZpbGVzIGNoYW5nZWQsIDQgaW5z ZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL3hlbi9wdmNh bGxzLWJhY2suYyBiL2RyaXZlcnMveGVuL3B2Y2FsbHMtYmFjay5jCmluZGV4IGFiZDZkYmMyOWFj Mi4uNThiZTE1YzI3YjZkIDEwMDY0NAotLS0gYS9kcml2ZXJzL3hlbi9wdmNhbGxzLWJhY2suYwor KysgYi9kcml2ZXJzL3hlbi9wdmNhbGxzLWJhY2suYwpAQCAtNzkyLDcgKzc5Miw3IEBAIHN0YXRp YyBpbnQgcHZjYWxsc19iYWNrX3BvbGwoc3RydWN0IHhlbmJ1c19kZXZpY2UgKmRldiwKIAltYXBw YXNzLT5yZXFjb3B5ID0gKnJlcTsKIAlpY3NrID0gaW5ldF9jc2sobWFwcGFzcy0+c29jay0+c2sp OwogCXF1ZXVlID0gJmljc2stPmljc2tfYWNjZXB0X3F1ZXVlOwotCWRhdGEgPSBxdWV1ZS0+cnNr cV9hY2NlcHRfaGVhZCAhPSBOVUxMOworCWRhdGEgPSBSRUFEX09OQ0UocXVldWUtPnJza3FfYWNj ZXB0X2hlYWQpICE9IE5VTEw7CiAJaWYgKGRhdGEpIHsKIAkJbWFwcGFzcy0+cmVxY29weS5jbWQg PSAwOwogCQlyZXQgPSAwOwpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9uZXQvcmVxdWVzdF9zb2NrLmgg Yi9pbmNsdWRlL25ldC9yZXF1ZXN0X3NvY2suaAppbmRleCAyM2UyMjA1NGFhNjAuLjA0YWEyYzdk MzVjNCAxMDA2NDQKLS0tIGEvaW5jbHVkZS9uZXQvcmVxdWVzdF9zb2NrLmgKKysrIGIvaW5jbHVk ZS9uZXQvcmVxdWVzdF9zb2NrLmgKQEAgLTE4MSw3ICsxODEsNyBAQCB2b2lkIHJlcXNrX2Zhc3Rv cGVuX3JlbW92ZShzdHJ1Y3Qgc29jayAqc2ssIHN0cnVjdCByZXF1ZXN0X3NvY2sgKnJlcSwKIAog c3RhdGljIGlubGluZSBib29sIHJlcXNrX3F1ZXVlX2VtcHR5KGNvbnN0IHN0cnVjdCByZXF1ZXN0 X3NvY2tfcXVldWUgKnF1ZXVlKQogewotCXJldHVybiBxdWV1ZS0+cnNrcV9hY2NlcHRfaGVhZCA9 PSBOVUxMOworCXJldHVybiBSRUFEX09OQ0UocXVldWUtPnJza3FfYWNjZXB0X2hlYWQpID09IE5V TEw7CiB9CiAKIHN0YXRpYyBpbmxpbmUgc3RydWN0IHJlcXVlc3Rfc29jayAqcmVxc2tfcXVldWVf cmVtb3ZlKHN0cnVjdCByZXF1ZXN0X3NvY2tfcXVldWUgKnF1ZXVlLApAQCAtMTkzLDcgKzE5Myw3 IEBAIHN0YXRpYyBpbmxpbmUgc3RydWN0IHJlcXVlc3Rfc29jayAqcmVxc2tfcXVldWVfcmVtb3Zl KHN0cnVjdCByZXF1ZXN0X3NvY2tfcXVldWUKIAlyZXEgPSBxdWV1ZS0+cnNrcV9hY2NlcHRfaGVh ZDsKIAlpZiAocmVxKSB7CiAJCXNrX2FjY2VwdHFfcmVtb3ZlZChwYXJlbnQpOwotCQlxdWV1ZS0+ cnNrcV9hY2NlcHRfaGVhZCA9IHJlcS0+ZGxfbmV4dDsKKwkJV1JJVEVfT05DRShxdWV1ZS0+cnNr cV9hY2NlcHRfaGVhZCwgcmVxLT5kbF9uZXh0KTsKIAkJaWYgKHF1ZXVlLT5yc2txX2FjY2VwdF9o ZWFkID09IE5VTEwpCiAJCQlxdWV1ZS0+cnNrcV9hY2NlcHRfdGFpbCA9IE5VTEw7CiAJfQpkaWZm IC0tZ2l0IGEvbmV0L2lwdjQvaW5ldF9jb25uZWN0aW9uX3NvY2suYyBiL25ldC9pcHY0L2luZXRf Y29ubmVjdGlvbl9zb2NrLmMKaW5kZXggZjcyMjRjNGZjMzBmLi5kYTU1Y2U2MmZlNTAgMTAwNjQ0 Ci0tLSBhL25ldC9pcHY0L2luZXRfY29ubmVjdGlvbl9zb2NrLmMKKysrIGIvbmV0L2lwdjQvaW5l dF9jb25uZWN0aW9uX3NvY2suYwpAQCAtOTM2LDcgKzkzNiw3IEBAIHN0cnVjdCBzb2NrICppbmV0 X2Nza19yZXFza19xdWV1ZV9hZGQoc3RydWN0IHNvY2sgKnNrLAogCQlyZXEtPnNrID0gY2hpbGQ7 CiAJCXJlcS0+ZGxfbmV4dCA9IE5VTEw7CiAJCWlmIChxdWV1ZS0+cnNrcV9hY2NlcHRfaGVhZCA9 PSBOVUxMKQotCQkJcXVldWUtPnJza3FfYWNjZXB0X2hlYWQgPSByZXE7CisJCQlXUklURV9PTkNF KHF1ZXVlLT5yc2txX2FjY2VwdF9oZWFkLCByZXEpOwogCQllbHNlCiAJCQlxdWV1ZS0+cnNrcV9h Y2NlcHRfdGFpbC0+ZGxfbmV4dCA9IHJlcTsKIAkJcXVldWUtPnJza3FfYWNjZXB0X3RhaWwgPSBy ZXE7Ci0tIAoyLjIwLjEKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0 Lm9yZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRl dmVs From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BCF4FC33CAF for ; Thu, 16 Jan 2020 17:30:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 937B924739 for ; Thu, 16 Jan 2020 17:30:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579195813; bh=GqT+VFCz0fjwLD0nspadbZFk3K0CQrDFdoHxecWoKJY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=GePdKyS3zDXy/B+6H5LOrkADirbk50qXgq41+LYD8EmbikA9rY04KtH/gBtU/LwI5 olwpohcoVrdCorP7mZCcEdb+qvuFm2q1Bqok7eE9sOxbuZis/NYrH7NTzFGrVWcp/d zlHCzN6sufqq/kjRiJbZGcwHdQz//LHbmeujpzkc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404332AbgAPRaM (ORCPT ); Thu, 16 Jan 2020 12:30:12 -0500 Received: from mail.kernel.org ([198.145.29.99]:42348 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392960AbgAPRaG (ORCPT ); Thu, 16 Jan 2020 12:30:06 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D303324721; Thu, 16 Jan 2020 17:30:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579195805; bh=GqT+VFCz0fjwLD0nspadbZFk3K0CQrDFdoHxecWoKJY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PeIDTAum8YvyOGvNSCbuMlKUy5AFa40ICcUYOI67uU4Q84F0BEKzwXfbq9iJoX1jM +Rg78qkTTtdpyKDSG/yy0DL+lJFwR8pdH3f7F40GHXUo4vQgt0DzwDQu/0vk87cQ8S Ob1AtOQcePEfcsb0fc2blqrN8moiXuigs+XD6BGE= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Eric Dumazet , Jakub Kicinski , Sasha Levin , xen-devel@lists.xenproject.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 319/371] net: add {READ|WRITE}_ONCE() annotations on ->rskq_accept_head Date: Thu, 16 Jan 2020 12:23:11 -0500 Message-Id: <20200116172403.18149-262-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116172403.18149-1-sashal@kernel.org> References: <20200116172403.18149-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Eric Dumazet [ Upstream commit 60b173ca3d1cd1782bd0096dc17298ec242f6fb1 ] reqsk_queue_empty() is called from inet_csk_listen_poll() while other cpus might write ->rskq_accept_head value. Use {READ|WRITE}_ONCE() to avoid compiler tricks and potential KCSAN splats. Fixes: fff1f3001cc5 ("tcp: add a spinlock to protect struct request_sock_queue") Signed-off-by: Eric Dumazet Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/xen/pvcalls-back.c | 2 +- include/net/request_sock.h | 4 ++-- net/ipv4/inet_connection_sock.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/xen/pvcalls-back.c b/drivers/xen/pvcalls-back.c index abd6dbc29ac2..58be15c27b6d 100644 --- a/drivers/xen/pvcalls-back.c +++ b/drivers/xen/pvcalls-back.c @@ -792,7 +792,7 @@ static int pvcalls_back_poll(struct xenbus_device *dev, mappass->reqcopy = *req; icsk = inet_csk(mappass->sock->sk); queue = &icsk->icsk_accept_queue; - data = queue->rskq_accept_head != NULL; + data = READ_ONCE(queue->rskq_accept_head) != NULL; if (data) { mappass->reqcopy.cmd = 0; ret = 0; diff --git a/include/net/request_sock.h b/include/net/request_sock.h index 23e22054aa60..04aa2c7d35c4 100644 --- a/include/net/request_sock.h +++ b/include/net/request_sock.h @@ -181,7 +181,7 @@ void reqsk_fastopen_remove(struct sock *sk, struct request_sock *req, static inline bool reqsk_queue_empty(const struct request_sock_queue *queue) { - return queue->rskq_accept_head == NULL; + return READ_ONCE(queue->rskq_accept_head) == NULL; } static inline struct request_sock *reqsk_queue_remove(struct request_sock_queue *queue, @@ -193,7 +193,7 @@ static inline struct request_sock *reqsk_queue_remove(struct request_sock_queue req = queue->rskq_accept_head; if (req) { sk_acceptq_removed(parent); - queue->rskq_accept_head = req->dl_next; + WRITE_ONCE(queue->rskq_accept_head, req->dl_next); if (queue->rskq_accept_head == NULL) queue->rskq_accept_tail = NULL; } diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c index f7224c4fc30f..da55ce62fe50 100644 --- a/net/ipv4/inet_connection_sock.c +++ b/net/ipv4/inet_connection_sock.c @@ -936,7 +936,7 @@ struct sock *inet_csk_reqsk_queue_add(struct sock *sk, req->sk = child; req->dl_next = NULL; if (queue->rskq_accept_head == NULL) - queue->rskq_accept_head = req; + WRITE_ONCE(queue->rskq_accept_head, req); else queue->rskq_accept_tail->dl_next = req; queue->rskq_accept_tail = req; -- 2.20.1