From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-177.mta0.migadu.com (out-177.mta0.migadu.com [91.218.175.177]) (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 8DFDC1A6810 for ; Thu, 30 Apr 2026 09:06:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.177 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777539962; cv=none; b=suHZtIN7F561B7bkhE9zDx2PT/kbc9T7b3kSixs5zFBdfyS/tC3lgBLuKpmcXmBwHxJfgKR86QqiO+KuZWzs8kbyJo1r1CZYj/NcFtkTntuAhcZPw9PreYAoxiVHZE26R5oj9BWc+icE3tssvajNdqQfKXvPAbBNzjxBkNO4fWY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777539962; c=relaxed/simple; bh=ot8RZ1mBjO7hyMpwt4w1JlEgoj5gEdRJBQoWICe8ZzU=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=JgCGMZMIyo8K4POZA8kyNhJBx/1goQPjDIB6IbmSpJEsXvMdSM0MGubSLv2DNJ+7Bu900m5QCGeLmoDbuiht7sWdCTfn1arb4Mpg8fXujsVYT9Ff4EEUp1dL0vzWqu5RCLC4TIrGXiiVOfjoElWul/RGYxP58k8FpyJyTOyr3GQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=G8qTBwo5; arc=none smtp.client-ip=91.218.175.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="G8qTBwo5" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1777539948; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=hCANES//Zba6NT24A7SxC6UwfIqx4fR+aEhtC8a7AAk=; b=G8qTBwo5Jp0so5tpGpRmq62SARaYQvkSOFHNe0CyFfVBjMLJUWw6dHPlXena3mM7nvAq6F eKV/ocG0Oir2b9i+B6/yUEX0CHX4WE8yTTTNsKX3BoFWNgAVMykOFuIa80y7CgtW+7NZHH UspMfphfRdRG+7q7EzJ1lrICsjycfa8= From: Qingfang Deng To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Qingfang Deng , Simon Horman , Kees Cook , Taegu Ha , Sebastian Andrzej Siewior , linux-ppp@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 1/3] ppp: use file.dead to check channel unregistration Date: Thu, 30 Apr 2026 17:05:21 +0800 Message-ID: <20260430090532.244758-1-qingfang.deng@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT Currently, ppp_generic checks if pch->chan is NULL to determine if a channel is being unregistered. However, struct ppp_file already has a 'dead' flag for this purpose, which is used by ppp units and other parts of the driver. Switch all pch->chan NULL checks to pch->file.dead checks. In ppp_unregister_channel, move the setting of pch->file.dead inside the locked section to ensure atomicity and remove the now redundant pch->chan = NULL assignment. This is a preparation to eventually unify 'struct ppp_channel' and 'struct channel' into a single struct. Signed-off-by: Qingfang Deng --- drivers/net/ppp/ppp_generic.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c index 57c68efa5ff8..aef42a69b63c 100644 --- a/drivers/net/ppp/ppp_generic.c +++ b/drivers/net/ppp/ppp_generic.c @@ -790,7 +790,7 @@ static long ppp_ioctl(struct file *file, unsigned int cmd, unsigned long arg) down_read(&pch->chan_sem); chan = pch->chan; err = -ENOTTY; - if (chan && chan->ops->ioctl) + if (!pch->file.dead && chan->ops->ioctl) err = chan->ops->ioctl(chan, cmd, arg); up_read(&pch->chan_sem); } @@ -2167,7 +2167,7 @@ static void __ppp_channel_push(struct channel *pch, struct ppp *ppp) struct sk_buff *skb; spin_lock(&pch->downl); - if (pch->chan) { + if (!pch->file.dead) { while (!skb_queue_empty(&pch->file.xq)) { skb = skb_dequeue(&pch->file.xq); if (!pch->chan->ops->start_xmit(pch->chan, skb)) { @@ -2288,7 +2288,7 @@ static bool ppp_channel_bridge_input(struct channel *pch, struct sk_buff *skb) goto out_rcu; spin_lock_bh(&pchb->downl); - if (!pchb->chan) { + if (pchb->file.dead) { /* channel got unregistered */ kfree_skb(skb); goto outl; @@ -3002,7 +3002,7 @@ ppp_unregister_channel(struct ppp_channel *chan) ppp_disconnect_channel(pch); down_write(&pch->chan_sem); spin_lock_bh(&pch->downl); - pch->chan = NULL; + pch->file.dead = 1; spin_unlock_bh(&pch->downl); up_write(&pch->chan_sem); @@ -3013,7 +3013,6 @@ ppp_unregister_channel(struct ppp_channel *chan) ppp_unbridge_channels(pch); - pch->file.dead = 1; wake_up_interruptible(&pch->file.rwait); ppp_release_channel(pch); @@ -3505,7 +3504,7 @@ ppp_connect_channel(struct channel *pch, int unit) ppp_lock(ppp); spin_lock_bh(&pch->downl); - if (!pch->chan) { + if (pch->file.dead) { /* Don't connect unregistered channels */ spin_unlock_bh(&pch->downl); ppp_unlock(ppp); -- 2.43.0