From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 69D2438E13F for ; Wed, 4 Mar 2026 09:07:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772615230; cv=none; b=rlQagQ28cuTNhOmUQkwUWtgfbZDZYr7ymZAQFYIEKldcUg1aJf3XiKk6M3g4Thx17gi202FP2syvrDDIU+42J+EcVrh7ZfTW4Kwen08Rw4bNmCOMZncXuVr0BKFxiCzpJFu16tFWT1QF4WtAMlq4gkx6fuLbrElhyJBHROtkMpI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772615230; c=relaxed/simple; bh=MenES2bnD3YIFT8HkiuN9URfZnWIKlc//r8AacAz8MY=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=j/iyHxfGoue0VtKl5yBwf3RMR7FiYjdpQPmNPIiDo4EdlfUb7ZGDb1/cHLJTrfy9GxaVHYxkvqnPENoDdx39dnORJdur3TEhmQUUP9Yy17WJQxIpQ296IdOMtZ9gc7i8zZ18DIYXHuZcEJWv9wos6gQLdTEnXiOQwDbXQFX300E= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=Lcw9Zhac; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=mMsY2mdY; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Lcw9Zhac"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="mMsY2mdY" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772615228; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qJ+svJhZviY13V6jetu+2Lop8pt2Tw6oU+fGIcexD3k=; b=Lcw9ZhacHRnJ4Mi92ZqnQy6x1eixD8GrUDdJk85td5pcsYoUDeRrVFuWkb2EElflmFGUAP hECxvRVxXZ+rG3meDzfegX7FIryeGIfYnLYOGfuQ46qpyRz0CTofsfkC270+sXRUaclYnS a29yWGnHY6lc7R7X36BZPwTml6AkXvw= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-477-jl93l_lVNoGiT9dXiFK-Rg-1; Wed, 04 Mar 2026 04:07:07 -0500 X-MC-Unique: jl93l_lVNoGiT9dXiFK-Rg-1 X-Mimecast-MFC-AGG-ID: jl93l_lVNoGiT9dXiFK-Rg_1772615226 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-4837bfcfe0dso84942815e9.1 for ; Wed, 04 Mar 2026 01:07:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1772615226; x=1773220026; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=qJ+svJhZviY13V6jetu+2Lop8pt2Tw6oU+fGIcexD3k=; b=mMsY2mdY1DyLC8jO2QM8WuGFJgPZg4QmlyjbYN47LKzXYBrmr418/HvdSWw+wBxoSj m/tlp+hO7hcSS0ochN/SISnJELjFb3Y6abOj1Zo9VgbEhq/xdGBfZEdFykPyupilGYld drPjBxq/7pr1IT0EDBV5QLzWPDj4jU+PC6YIZ2+pnPKAj4rbGNQ9VxXrV9GwxBW9qfUa SZZAHUTe1yoK6qhMkgzNryTV+5xatsaaaaYKO9bSMX/DG2Zt/lhpzUMk1yuViR8C7Jks S8N7E/ij4E3tYy1SUWUEmQPzqhQTaQH+9dKI/wCwc91XSS6/VXCR03iy1O1fshWW4laq mlCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772615226; x=1773220026; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=qJ+svJhZviY13V6jetu+2Lop8pt2Tw6oU+fGIcexD3k=; b=L5Glv6Joljp9wAoe0Vj5kLZ/4PrFJwr37QGQii+IHh8isEaVFcIrO8jycDohnYy2UH GXnapl8ti3LvSjnERUKlAYVM58IZJH8JV+Pen1kPG0vpT/ma0U+c+t6XUt2GNqwGh2Du nWl4BbcW0QnjwYXk+rbfUdj6pFtrXZPqyCl/bdGt9yr4HVxE7ubP9UbzmU10JRLAVGCz w4+xnDNTSIHHiuDXTkiG91eHbDkmWjhf8yeUFaP7beGqA8wkXMUotLbUU+1NSQanmZBS au6h9D2XNFu+R2dP9F55x1fuqBr5pdJ2zEGAZHBj8B8uurnT1f6L9fOtBcImSPjXeyi6 rG6w== X-Forwarded-Encrypted: i=1; AJvYcCU2b74i1R+FVLi5bu242u6ywIvsl2nGbNefjIZ9cBFJ/pTn74eqzg1DxUJy5g22iMko27rP6JHIm97m/tA=@vger.kernel.org X-Gm-Message-State: AOJu0Yw3rOt1i1StQys68L0faq8ESFzGGOztBA3sc48TWoflhWkpYL+m qmbjj24v7bcAZ8ztFS2t4v33HqVQ59Fvc/8e8R3JJeX49UYf2CNm2OFHBI9rT1gIc8HJpm7+lgH ERnhE0VF3pUF4Ic3i2Q4Ke89sPtC3iR7G1y68HHVIRad3ZvSZlM8U/fyd6aNSrB2kyw== X-Gm-Gg: ATEYQzw55dfPtTXJNtnBPn61eqGaMdkMuAb9QJfokySzirFNTTE8jHad2pf118xcEho y7YqDyJ/e/fHPSwux8Cuqc9aOWbRuKM3BzFpXv6+q19yrdUBNUbT2e8cUHNAiL4hWlSOOC8RmEL cB6mPg0olL+DkbLxsqUuv71OOq3mFBV/3jqaN9odjevyoaMRzwyBN7qmOO/gDBrQDLZKdAMhEyr SU1trgzFyGMJ6P7RwvewD6jkOBosVI7Lgf7bv6ZjD7Pxs3OISfKVgtN2MqG62Hh6G3CtXWVxMTM gfCQDAAp0w94u9cvNE1G9U8I3OsMsNvnQoez5rLmgblJizVlID+tfPAuXNsyJXPgkjujAQlsABU 458/5U72dDp86YpbnnWH6ExfH+Q== X-Received: by 2002:a05:600c:608c:b0:483:bcff:7948 with SMTP id 5b1f17b1804b1-48519847972mr20302095e9.10.1772615225927; Wed, 04 Mar 2026 01:07:05 -0800 (PST) X-Received: by 2002:a05:600c:608c:b0:483:bcff:7948 with SMTP id 5b1f17b1804b1-48519847972mr20301505e9.10.1772615225458; Wed, 04 Mar 2026 01:07:05 -0800 (PST) Received: from [192.168.88.32] ([212.105.149.216]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4851aceb94dsm6878875e9.4.2026.03.04.01.07.04 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 04 Mar 2026 01:07:04 -0800 (PST) Message-ID: <64132462-e640-4ea6-82e8-48ca07a6ad44@redhat.com> Date: Wed, 4 Mar 2026 10:07:02 +0100 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH net] mptcp: fix soft lockup in mptcp_recvmsg() To: Li Xiasong , matttbe@kernel.org, martineau@kernel.org, geliang@kernel.org, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, horms@kernel.org Cc: netdev@vger.kernel.org, mptcp@lists.linux.dev, linux-kernel@vger.kernel.org, weiyongjun1@huawei.com, yuehaibing@huawei.com, zhangchangzhong@huawei.com References: <20260302052651.1466983-1-lixiasong1@huawei.com> Content-Language: en-US From: Paolo Abeni In-Reply-To: <20260302052651.1466983-1-lixiasong1@huawei.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 3/2/26 6:26 AM, Li Xiasong wrote: > @@ -2343,7 +2347,7 @@ static int mptcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, > > pr_debug("block timeout %ld\n", timeo); > mptcp_cleanup_rbuf(msk, copied); > - err = sk_wait_data(sk, &timeo, NULL); > + err = sk_wait_data(sk, &timeo, last); Isn't err = sk_wait_data(sk, &timeo, skb_peek_tail(&sk->sk_receive_queue)); Enough? Also, could you please add a paired tests-case? Thanks! Paolo