From patchwork Wed Jan 17 06:52:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chang, Junxiao" X-Patchwork-Id: 188701 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:42cf:b0:101:a8e8:374 with SMTP id q15csp733480dye; Tue, 16 Jan 2024 22:53:04 -0800 (PST) X-Google-Smtp-Source: AGHT+IGSSrJGIaxT4wVaIS2axnGljfyuyLWzyAexVW3lC1GLjYR3Vr7zJ2kiluZwOfBPNEliAfWO X-Received: by 2002:a05:6402:110a:b0:559:d2eb:1c15 with SMTP id u10-20020a056402110a00b00559d2eb1c15mr262086edv.24.1705474384375; Tue, 16 Jan 2024 22:53:04 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705474384; cv=pass; d=google.com; s=arc-20160816; b=TRU6j1FPXeiV/P9TxA6kFrvMwiDnlgFJGTxf1fMjV7xyWmGGgjkPqs5B2CCFbkf0Ur H97Kgck2gPQRA+x2Y/JZDQBxWArtx3Nl21zFkYXGJfG7n71/WhQu9yh9Y6iAmdPG+UC+ XcD4Ur2gQnHI6IxDN55jntKrfcARsWEkBaJIodncmsvtUYXyo2ecFJV7FDJZrNffAiwY LByXUKd40BT2ZqYUjdUH8RihPQf6cg1ii4SmMn8Eg8RxHJxSUcTz6+S7U899VT0QYThh gBVEUIPNdtnX5YwGEWGIL6FFCtgslHO9OLvv1vnP3+UEaFNXkA/Br8CdWl7vZ82oue/p wncA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=NFTrQOyW8egGZljdOPweqJxLPs8/r6GYiluHLpghnwY=; fh=3n9yk9H0aP61VWOkjV8qJHqEh2nN7MsL3m9A3XvFOBk=; b=r6YBuDiT9cwt6XRpkqT1LolWaloHfFA298T5Yr1MJAkXoeDJRqBzuRilgFZhdPLZsv ruoDVqHtX0Ch9qIxTP6/fgtSHhCiBMTT5esoIcaNvidzkORo7vmPBxPHkR0hoY76/ko4 P/iDu2t19g+oFr81v2DzWp9+DCIZmSRM6eaosYoA3++kF2ZjZloXFky09m5MphBB64SU 0eN8MdaFqlFlZrEdLbAejthCiinW3yrNJ89DwcjnQcCPHKsB95oRAnwMUQkS+XaRN97O D5epUmAbAuJh8kG3CGX+MqPJPcCSnR6IQqWMNl5+CorIfSIqX/xfmlOs2tKI/0Jcpn1G kqig== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=kpFaKOcn; arc=pass (i=1 spf=pass spfdomain=intel.com dkim=pass dkdomain=intel.com dmarc=pass fromdomain=intel.com); spf=pass (google.com: domain of linux-kernel+bounces-28581-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-28581-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id g21-20020a056402091500b00553f946c1casi5476976edz.354.2024.01.16.22.53.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jan 2024 22:53:04 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-28581-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=kpFaKOcn; arc=pass (i=1 spf=pass spfdomain=intel.com dkim=pass dkdomain=intel.com dmarc=pass fromdomain=intel.com); spf=pass (google.com: domain of linux-kernel+bounces-28581-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-28581-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 002BD1F22DBB for ; Wed, 17 Jan 2024 06:53:04 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3798EBA50; Wed, 17 Jan 2024 06:52:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="kpFaKOcn" Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) (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 A7DC78F47; Wed, 17 Jan 2024 06:52:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705474362; cv=none; b=iDDpFRmDorX2xxMwf9ED+F1Ge8FSydli2c3es2DqAxPgIuxJ9yA7E1uRhpdx+bD0ihWKvRZ5SVf2WsUIXJnc6mG3zo+Pg54mKXnNu4lMPqSYMvlQDbqHeHFK4jCcQatEgnsE6BzZpdwiKjBZupVwwmEelKWwH3R0g4NJQ/I7UaA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705474362; c=relaxed/simple; bh=KtZv8F8FHVAovFoALPdwWBhpOPjZ1RcvIXZt7uUSRaE=; h=DKIM-Signature:X-IronPort-AV:X-IronPort-AV:Received:X-ExtLoop1: X-IronPort-AV:X-IronPort-AV:Received:From:To:Cc:Subject:Date: Message-Id:X-Mailer:MIME-Version:Content-Transfer-Encoding; b=joyJQoN2PP7PxzTL+G2N6KvYuFbYQwSEXW8CKfGzx0zNFtlQLaK1xLPr1kT1tUj1Zr52Vnay+6Lq12XWC1F7qLSnNvzhpNIU/e8kcs/IassOLv5avFJAq4ddlQ5oKd71Lp8dBewqc8ghzMYV199njiXik/wle0tkSG+1GegUGbI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=kpFaKOcn; arc=none smtp.client-ip=198.175.65.12 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1705474361; x=1737010361; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=KtZv8F8FHVAovFoALPdwWBhpOPjZ1RcvIXZt7uUSRaE=; b=kpFaKOcnyl/3gioIXLm0rWiDw4WDlpI4AoswKXQifvwnYVtyZZuDwU54 Q8JGAftIIlAmTX1OzLWHgsLosnViP6ctSeFPUZBa4pA39ekPaBUPiI2VJ 3JFWnIk1YigrvskRZmasmU3SvVai+VoMOMmFViGcBeFtUH1dhu2OBnQJm pwqg+nFy3eAB/0m218rdgRpbn+tVkyUfmbk+jDcc4/z2CrQ8t11vzDjsw sg7TEtUGa3IbP1ZNtws+PrxIGM1DKrK969p4kudlbaEBwy7DsvCQQu4u0 LidPhTOm2IHdpZw6wDtBDfoNBnN3ZMuHjHXFwyOPMjQNll4Y4Z/i2hy+T g==; X-IronPort-AV: E=McAfee;i="6600,9927,10955"; a="7467391" X-IronPort-AV: E=Sophos;i="6.05,200,1701158400"; d="scan'208";a="7467391" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Jan 2024 22:52:39 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10955"; a="733881873" X-IronPort-AV: E=Sophos;i="6.05,200,1701158400"; d="scan'208";a="733881873" Received: from junxiaochang.bj.intel.com ([10.238.157.86]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Jan 2024 22:52:35 -0800 From: Junxiao Chang To: bigeasy@linutronix.de, tglx@linutronix.de, rostedt@goodmis.org, linux-kernel@vger.kernel.org Cc: john.ogness@linutronix.de, hao3.li@intel.com, lili.li@intel.com, jianfeng.gao@intel.com, linux-rt-users@vger.kernel.org Subject: [PATCH] printk: nbcon: check uart port is nbcon or not in nbcon_release Date: Wed, 17 Jan 2024 14:52:26 +0800 Message-Id: <20240117065226.4166127-1-junxiao.chang@intel.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788319507926157549 X-GMAIL-MSGID: 1788319507926157549 Different uart ports might have same console pointer, not all of uart ports are nbcon. When uart port is shutdown, only release nbcon if it is nbcon. There is same nbcon checking in API nbcon_acquire. Fixes: 6424f396c49e ("printk: nbcon: Implement processing in port->lock wrapper") Signed-off-by: Junxiao Chang --- kernel/printk/nbcon.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kernel/printk/nbcon.c b/kernel/printk/nbcon.c index 1b1b585b1675b..e53b8bebbb57e 100644 --- a/kernel/printk/nbcon.c +++ b/kernel/printk/nbcon.c @@ -1623,6 +1623,9 @@ void nbcon_release(struct uart_port *up) .prio = NBCON_PRIO_NORMAL, }; + if (!uart_is_nbcon(up)) + return; + if (!con->locked_port) return;