From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <3chas3@gmail.com> Received: from mail-qt0-f170.google.com (mail-qt0-f170.google.com [209.85.216.170]) by dpdk.org (Postfix) with ESMTP id D420F1DBE for ; Wed, 5 Sep 2018 02:51:34 +0200 (CEST) Received: by mail-qt0-f170.google.com with SMTP id t39-v6so6236614qtc.8 for ; Tue, 04 Sep 2018 17:51:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=hziLQNZtN7UWv0r7AU0kGjHA3AS5x2DureloDeE/Ev4=; b=U1CoSK3QwfmII3NMquZFTveHTyFEJb5i4fuAmT88wyZk2rro3LzEPE/e84OlPtpNhw t3SN+Gynn5S+MIxjktZ6nGaaxBwULQdkKENi1feejw/U7kyPpwuWliBQJ/9OwVNirj4x s9fFdRWUd3pkHZdWtLsfbIMvmxfThfWC6U3QPO9pYQznnyImBHOyuDhPP1+FWNLC1BdE eQp4yM0K3IsaTayHiezJ02Cc4Ebgm9y812HISq9U3x7EuWkm0fHinRBXkipIYCPcp9Y7 DTrtk0gnkyHgL1ubJtAGqCz9BOLcKQPENOzdve9goDw/wmi9i0klyRpOVL2pQtsxJk6Q oz2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=hziLQNZtN7UWv0r7AU0kGjHA3AS5x2DureloDeE/Ev4=; b=srHa8FQ7ir+hJ5JA6+3aHxyrg6q3bOjj36ZXxYvcZeQfedUbvyXrDw2f4lOvGR+RYf Tm1Ojc65od5tgS6B6hUrcicZ56hcUdD7Lh31cn9Lh02Q1QlIqJFtfXVniKd7hGjtL4oB 5d8kH7hNdGavXRIKeSNHYTZOq4jpuK61YDzdeW8Dh+YI8DuZsLLqD/KETpjOHAWArtfs zYHAKrKn8uDhaZztKVXF6OdtEKBsStRaZPC8R4UX8dMlDA5BBx84yfOzomzWsuCBmGIT Z7Po67WGoO7MMKIg0vbuao4n1c1oDGK/bAeK4VYaOGftLkhDyav9gdDaUxZnx/ykoq+8 jDQg== X-Gm-Message-State: APzg51AkpRVFc73q3awzqeoE9E13MTf1A+DImgaahAaCbQrZAFXLELoi ZuvQyFSfP8tWIN02CK0DzmbG61ZT X-Google-Smtp-Source: ANB0VdbMrc7s2GDYJWsHT3K8VbgBsCoLWyAjv1NfOjEA2uCIbKn60wmWAHkDDOS4UAYajyTCCAz3vA== X-Received: by 2002:a0c:eac3:: with SMTP id y3-v6mr30186315qvp.89.1536108694134; Tue, 04 Sep 2018 17:51:34 -0700 (PDT) Received: from monolith.fios-router.home (pool-173-79-169-217.washdc.fios.verizon.net. [173.79.169.217]) by smtp.gmail.com with ESMTPSA id v129-v6sm167185qkd.86.2018.09.04.17.51.33 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Sep 2018 17:51:33 -0700 (PDT) From: Chas Williams <3chas3@gmail.com> To: stable@dpdk.org Cc: mark.rutland@arm.com, Chas Williams Date: Tue, 4 Sep 2018 20:51:29 -0400 Message-Id: <20180905005129.6242-1-3chas3@gmail.com> X-Mailer: git-send-email 2.14.4 Subject: [dpdk-stable] [PATCH][v4.9.y] Fixes: 3c226c637b69 ("mm: numa: avoid waiting on freed migrated pages") X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Sep 2018 00:51:35 -0000 From: Chas Williams Commit 3c226c637b69 ("mm: numa: avoid waiting on freed migrated pages") was an incomplete backport of the upstream commit. It is necessary to always reset page_nid before attempting any early exit. --- mm/huge_memory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 9efe88ef9702..e4c6c3edaf6a 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1259,12 +1259,12 @@ int do_huge_pmd_numa_page(struct fault_env *fe, pmd_t pmd) /* Migration could have started since the pmd_trans_migrating check */ if (!page_locked) { + page_nid = -1; if (!get_page_unless_zero(page)) goto out_unlock; spin_unlock(fe->ptl); wait_on_page_locked(page); put_page(page); - page_nid = -1; goto out; } -- 2.14.4