Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Content-Type: multipart/mixed; boundary="------------3cL3LDjvU14fMcomcm3uA5J9"
Message-ID: <6dddf3f2-40c1-a08b-ec0e-c4feafcad118@tessares.net>
Date:   Sat, 9 Jul 2022 11:11:47 +0200
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.11.0
Subject: Re: [PATCH v2 net 09/12] net: Fix data-races around sysctl_mem.
Content-Language: en-GB
To:     Kuniyuki Iwashima <kuniyu@amazon.com>,
        "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        Luis Chamberlain <mcgrof@kernel.org>,
        Kees Cook <keescook@chromium.org>,
        Iurii Zaikin <yzaikin@google.com>
Cc:     Kuniyuki Iwashima <kuni1840@gmail.com>, netdev@vger.kernel.org,
        linux-kernel@vger.kernel.org,
        MPTCP Upstream <mptcp@lists.linux.dev>
References: <20220706234003.66760-1-kuniyu@amazon.com>
 <20220706234003.66760-10-kuniyu@amazon.com>
From:   Matthieu Baerts <matthieu.baerts@tessares.net>
In-Reply-To: <20220706234003.66760-10-kuniyu@amazon.com>
Precedence: bulk

This is a multi-part message in MIME format.
--------------3cL3LDjvU14fMcomcm3uA5J9
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit

Hello,

On 07/07/2022 01:40, Kuniyuki Iwashima wrote:
> While reading .sysctl_mem, it can be changed concurrently.
> So, we need to add READ_ONCE() to avoid data-races.

FYI, we got a small conflict when merging -net in net-next in the MPTCP
tree due to this patch applied in -net:

  310731e2f161 ("net: Fix data-races around sysctl_mem.")

and this one from net-next:

  e70f3c701276 ("Revert "net: set SK_MEM_QUANTUM to 4096"")

The conflict has been resolved on our side[1] and the resolution we
suggest is attached to this email.

I'm sharing this thinking it can help others but if it only creates
noise, please tell me! :)

Cheers,
Matt

[1] https://github.com/multipath-tcp/mptcp_net-next/commit/b01bda9d0fe6
-- 
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net
--------------3cL3LDjvU14fMcomcm3uA5J9
Content-Type: text/x-patch; charset=UTF-8; name="b01bda9d0fe6.patch"
Content-Disposition: attachment; filename="b01bda9d0fe6.patch"
Content-Transfer-Encoding: base64

ZGlmZiAtLWNjIGluY2x1ZGUvbmV0L3NvY2suaAppbmRleCAwZGQ0M2MzZGY0OWIsOWZhNTQ3
NjJlMDc3Li5mN2FkMWE3NzA1ZTkKLS0tIGEvaW5jbHVkZS9uZXQvc29jay5oCisrKyBiL2lu
Y2x1ZGUvbmV0L3NvY2suaApAQEAgLTE1NDEsMTAgLTE1MjEsMjIgKzE1NDEsMTAgQEBAIHZv
aWQgX19za19tZW1fcmVjbGFpbShzdHJ1Y3Qgc29jayAqc2ssIAogICNkZWZpbmUgU0tfTUVN
X1NFTkQJMAogICNkZWZpbmUgU0tfTUVNX1JFQ1YJMQogIAogLS8qIHN5c2N0bF9tZW0gdmFs
dWVzIGFyZSBpbiBwYWdlcywgd2UgY29udmVydCB0aGVtIGluIFNLX01FTV9RVUFOVFVNIHVu
aXRzICovCiArLyogc3lzY3RsX21lbSB2YWx1ZXMgYXJlIGluIHBhZ2VzICovCiAgc3RhdGlj
IGlubGluZSBsb25nIHNrX3Byb3RfbWVtX2xpbWl0cyhjb25zdCBzdHJ1Y3Qgc29jayAqc2ss
IGludCBpbmRleCkKICB7Ci0gCXJldHVybiBzay0+c2tfcHJvdC0+c3lzY3RsX21lbVtpbmRl
eF07CiAtCWxvbmcgdmFsID0gUkVBRF9PTkNFKHNrLT5za19wcm90LT5zeXNjdGxfbWVtW2lu
ZGV4XSk7CiAtCiAtI2lmIFBBR0VfU0laRSA+IFNLX01FTV9RVUFOVFVNCiAtCXZhbCA8PD0g
UEFHRV9TSElGVCAtIFNLX01FTV9RVUFOVFVNX1NISUZUOwogLSNlbGlmIFBBR0VfU0laRSA8
IFNLX01FTV9RVUFOVFVNCiAtCXZhbCA+Pj0gU0tfTUVNX1FVQU5UVU1fU0hJRlQgLSBQQUdF
X1NISUZUOwogLSNlbmRpZgogLQlyZXR1cm4gdmFsOworKwlyZXR1cm4gUkVBRF9PTkNFKHNr
LT5za19wcm90LT5zeXNjdGxfbWVtW2luZGV4XSk7CiAgfQogIAogIHN0YXRpYyBpbmxpbmUg
aW50IHNrX21lbV9wYWdlcyhpbnQgYW10KQo=

--------------3cL3LDjvU14fMcomcm3uA5J9--