From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.4 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BF14EC432C3 for ; Tue, 26 Nov 2019 17:05:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 917FB2073F for ; Tue, 26 Nov 2019 17:05:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="OP9PumkS" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728558AbfKZRF6 (ORCPT ); Tue, 26 Nov 2019 12:05:58 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:28702 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727309AbfKZRF5 (ORCPT ); Tue, 26 Nov 2019 12:05:57 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574787956; 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=VH/jX/dZgBdbxvSHzbbJtYI83fSwS9ikHw9OyhUvX10=; b=OP9PumkSHFPStkU8J3PdTkTrMbM1tsKnjzH3XhKO0MIWw7nvkeBcdxiPd5iJQFpVl7CZWN sqxW7za7K9jQ1ni7Jfmqf/bYn0Za8sp1Cjl8B5AlBTXmWcrcji/nWx/yXlz0RRawCRaFhd QPnvR2bzcmNo9jD0t7UnYeOXOQnUyF4= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-313-dM6vPsgEP9OLAjDP4lZ1oA-1; Tue, 26 Nov 2019 12:05:52 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B90FF101F4E0; Tue, 26 Nov 2019 17:05:51 +0000 (UTC) Received: from localhost (unknown [10.18.25.174]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6DD0A5D9CA; Tue, 26 Nov 2019 17:05:51 +0000 (UTC) Date: Tue, 26 Nov 2019 12:05:50 -0500 From: Mike Snitzer To: gregkh@linuxfoundation.org Cc: vcaputo@pengaru.com, stable@vger.kernel.org Subject: Re: FAILED: patch "[PATCH] Revert "dm crypt: use WQ_HIGHPRI for the IO and crypt" failed to apply to 4.19-stable tree Message-ID: <20191126170550.GA2718@redhat.com> References: <157476486318662@kroah.com> MIME-Version: 1.0 In-Reply-To: <157476486318662@kroah.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: dM6vPsgEP9OLAjDP4lZ1oA-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Tue, Nov 26 2019 at 5:41am -0500, gregkh@linuxfoundation.org wrote: >=20 > The patch below does not apply to the 4.19-stable tree. > If someone wants it applied there, or to any other stable or longterm > tree, then please email the backport, including the original git commit > id to . >=20 > thanks, >=20 > greg k-h >=20 I assume you didn't first pull in the prereq commit detailed in the commit header with: Requires: ed0302e83098d ("dm crypt: make workqueue names device-specific") ? Because this worked for me: git cherry-pick ed0302e83098d git cherry-pick f612b2132db529feac4f965f28a1b9258ea7c22b > ------------------ original commit in Linus's tree ------------------ >=20 > From f612b2132db529feac4f965f28a1b9258ea7c22b Mon Sep 17 00:00:00 2001 > From: Mike Snitzer > Date: Wed, 20 Nov 2019 17:27:39 -0500 > Subject: [PATCH] Revert "dm crypt: use WQ_HIGHPRI for the IO and crypt > workqueues" >=20 > This reverts commit a1b89132dc4f61071bdeaab92ea958e0953380a1. >=20 > Revert required hand-patching due to subsequent changes that were > applied since commit a1b89132dc4f61071bdeaab92ea958e0953380a1. >=20 > Requires: ed0302e83098d ("dm crypt: make workqueue names device-specific"= ) > Cc: stable@vger.kernel.org > Bug: https://bugzilla.kernel.org/show_bug.cgi?id=3D199857 > Reported-by: Vito Caputo > Signed-off-by: Mike Snitzer >=20 > diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c > index f87f6495652f..eb9782fc93fe 100644 > --- a/drivers/md/dm-crypt.c > +++ b/drivers/md/dm-crypt.c > @@ -2700,21 +2700,18 @@ static int crypt_ctr(struct dm_target *ti, unsign= ed int argc, char **argv) > =09} > =20 > =09ret =3D -ENOMEM; > -=09cc->io_queue =3D alloc_workqueue("kcryptd_io/%s", > -=09=09=09=09 WQ_HIGHPRI | WQ_CPU_INTENSIVE | WQ_MEM_RECLAIM, > -=09=09=09=09 1, devname); > +=09cc->io_queue =3D alloc_workqueue("kcryptd_io/%s", WQ_MEM_RECLAIM, 1, = devname); > =09if (!cc->io_queue) { > =09=09ti->error =3D "Couldn't create kcryptd io queue"; > =09=09goto bad; > =09} > =20 > =09if (test_bit(DM_CRYPT_SAME_CPU, &cc->flags)) > -=09=09cc->crypt_queue =3D alloc_workqueue("kcryptd/%s", > -=09=09=09=09=09=09 WQ_HIGHPRI | WQ_CPU_INTENSIVE | WQ_MEM_RECLAIM, > +=09=09cc->crypt_queue =3D alloc_workqueue("kcryptd/%s", WQ_CPU_INTENSIVE= | WQ_MEM_RECLAIM, > =09=09=09=09=09=09 1, devname); > =09else > =09=09cc->crypt_queue =3D alloc_workqueue("kcryptd/%s", > -=09=09=09=09=09=09 WQ_HIGHPRI | WQ_CPU_INTENSIVE | WQ_MEM_RECLAIM | WQ_= UNBOUND, > +=09=09=09=09=09=09 WQ_CPU_INTENSIVE | WQ_MEM_RECLAIM | WQ_UNBOUND, > =09=09=09=09=09=09 num_online_cpus(), devname); > =09if (!cc->crypt_queue) { > =09=09ti->error =3D "Couldn't create kcryptd queue"; >=20