From:   Jane Chu <jane.chu@oracle.com>
To:     david@fromorbit.com, djwong@kernel.org, dan.j.williams@intel.com,
        hch@infradead.org, vishal.l.verma@intel.com, dave.jiang@intel.com,
        agk@redhat.com, snitzer@redhat.com, dm-devel@redhat.com,
        ira.weiny@intel.com, willy@infradead.org, vgoyal@redhat.com,
        linux-fsdevel@vger.kernel.org, nvdimm@lists.linux.dev,
        linux-kernel@vger.kernel.org, linux-xfs@vger.kernel.org
Subject: [PATCH v3 7/7] pmem: fix pmem_do_write() avoid writing to 'np' page
Date:   Tue, 11 Jan 2022 11:59:30 -0700
Message-Id: <20220111185930.2601421-8-jane.chu@oracle.com>
In-Reply-To: <20220111185930.2601421-1-jane.chu@oracle.com>
References: <20220111185930.2601421-1-jane.chu@oracle.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?cn4W4Wffqelx+Nok6anZbGQxSgu+3g6z5f347IClPt+K/p1J8kldXyo8x105?=
 =?us-ascii?Q?1QqsEy+UZnsKQ12x6wtgIdQPxBJRZcfcb4EqmzeK5zgj7ngnzIy3O8/7wvrc?=
 =?us-ascii?Q?JuoH/U/Emq1P/z9EfbQc8SRnHpVMlXIIzkH/kWL3I4PLwSINSJgYCuJcgEqL?=
 =?us-ascii?Q?vhBNWSPXZ49p5nRy6XvIJNHNurDSFblYmD/+Mlmwjx8nWZ5Y54p5bYQ8rNwA?=
 =?us-ascii?Q?rLwWKMC2M17BJIrmAswYChZUTFM4nh5pGxTDufyplqGWD53LsfB0coDXUfYe?=
 =?us-ascii?Q?jHy+eVypExVYwAOuCGwE8F3poGiMyEe8b7ThJhqTFwWUdzcdTELO05En9t/u?=
 =?us-ascii?Q?b1tt9B9nVK5thogB9ZPkhXmWAdTXDkW6eD+MqJ6R5MrpvZUo4b+BTXbcPJnz?=
 =?us-ascii?Q?VNK0LylSAVHqWAxgVKA1BUo/VOqRIUQ3gYo/Do+A0ZsF1L2AVDsXyaYn6IKW?=
 =?us-ascii?Q?sAaIL27awsjEpl/Koa7c/clB+kMGsWDvfrtUdpHNVuPBLia8TDhZ6iXID/0h?=
 =?us-ascii?Q?hmIFOwSiw1ujWwgkJs+ZSEC4hlN1i+6/3O4/SD/cRZULs0ukLz2JzcHvOd/c?=
 =?us-ascii?Q?MwrY5SGFt3iaSXcICzJx7dLvICFzrAwjaWViusg5TE4xBzyhtFjE6DwSgTS4?=
 =?us-ascii?Q?qoJwdqDxW92EuJGcZiBDjgRpD8tRLPGa1cSYkneO4vfDwUEUaIhE2OVvLJCO?=
 =?us-ascii?Q?c8DvyBfqCxYzZD9u+JLPPdLcNQZl3K0JQQniiDXqhxW1AnF0Egn6v4p3/WEI?=
 =?us-ascii?Q?Z4epU+BCBHtzeFu9IkC5YBVACvmmSISJP8Mj2fkPqro9wmeEPvdo8LLls92K?=
 =?us-ascii?Q?byln/CsiZQse+Hlk8XGd08RI+o2Z+NM34SeTjqtTKT73V13vpgi0FkMw++ew?=
 =?us-ascii?Q?fOBlxqbjxLKREZZBoBfDiVGaiY+1aeZewdl2adAyb8o1hbJsZtzIvcmCDyMB?=
 =?us-ascii?Q?HNSBx0v3YEMIRYUVN5E3YOmt0wsDvjbufYJGwezwj3IUzbCrgEJ1k+rS9ttl?=
 =?us-ascii?Q?a+1xJWsiHIYBA8kUN+817zvNY6RlY7gpE4iJg/g5cc1pZYJdPSBHdIGztsUy?=
 =?us-ascii?Q?D9gRxH7D+Xw3QtifTUT1hH9qCKuUIlne89KbTTF9838wuWAqeHAqCtuj7Nww?=
 =?us-ascii?Q?PzQZP+qv/haQmg2Imh7t2sTyxQR+d3BafBLfVOS5yrFyBLXiXrkMhazSsANl?=
 =?us-ascii?Q?cx1MjnVqb5xEj4tXoGn/8pAjHV619+0sPdVpYU+U8uf5O2o+dgTi5JTP4WDB?=
 =?us-ascii?Q?BM8vFkvDecl1LF2Z4eP00Hbnu0CrqxLaUc+rulBBtzD8QPVC1CS088n3xuVh?=
 =?us-ascii?Q?i25594KqoaH3lFEMFGPvkNTU1EWyJTQqL4p+dRoedf9aflhHqlbyLqKd0aow?=
 =?us-ascii?Q?cBcqYNBu/0ojGhERk8vXOHy7sfxujyJpmjC4edhsRwiySOwBRyWjiARl31Lf?=
 =?us-ascii?Q?QPZ/SQXvWHtLJn6uVx+A6uiEq2hIgVx2bKyWKsKYgAXBUqk99KMz0j/kWQ/e?=
 =?us-ascii?Q?HTD0K35/hKpqg3Ifbh2cKI1dRhUniIkLpsxeP+PgaqwAa5bdZ0HeVEQ+qorG?=
 =?us-ascii?Q?j1oYD7/LgXZUQ9lsLDYyg4mr2BOOx6ueItBhGzGVJrBlYyIEeEHF4G4F3jbp?=
 =?us-ascii?Q?3H4wTpJr7DQDigMtm3kheKi2hf75DBWJN+kRU2kbLZIV?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 78961368-bcfc-4161-d875-08d9d5349491
X-MS-Exchange-CrossTenant-AuthSource: SJ0PR10MB4429.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jan 2022 19:00:06.0333
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: /ZFzvJ8WeYL9it8S4yw+o0N14TEIKesiBPcFPBfDWmMnWPa3v4jLoLwiBFEWNeS6WcpCwpgXmFLJHcmsYvmQMA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR10MB4495
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10224 signatures=668683
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 suspectscore=0 spamscore=0
 mlxlogscore=999 adultscore=0 phishscore=0 malwarescore=0 bulkscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000
 definitions=main-2201110102
X-Proofpoint-GUID: raBzGuXltzm9pvEsjZuwETW8Z3S3bzIb
X-Proofpoint-ORIG-GUID: raBzGuXltzm9pvEsjZuwETW8Z3S3bzIb
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Since poisoned page is marked as not-present, the first of the
two back-to-back write_pmem() calls can only be made when there
is no poison in the range, otherwise kernel Oops.

Signed-off-by: Jane Chu <jane.chu@oracle.com>
---
 drivers/nvdimm/pmem.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c
index dd2db4905c85..6e395014da5e 100644
--- a/drivers/nvdimm/pmem.c
+++ b/drivers/nvdimm/pmem.c
@@ -187,10 +187,15 @@ static blk_status_t pmem_do_write(struct pmem_device *pmem,
 	 * after clear poison.
 	 */
 	flush_dcache_page(page);
-	write_pmem(pmem_addr, page, page_off, len);
-	if (unlikely(bad_pmem)) {
-		rc = pmem_clear_poison(pmem, pmem_off, len);
+	if (!bad_pmem) {
 		write_pmem(pmem_addr, page, page_off, len);
+	} else {
+		rc = pmem_clear_poison(pmem, pmem_off, len);
+		if (rc == BLK_STS_OK)
+			write_pmem(pmem_addr, page, page_off, len);
+		else
+			pr_warn("%s: failed to clear poison\n",
+				__func__);
 	}
 
 	return rc;
-- 
2.18.4