Thu Jul 8 11:23:29 2021 UTC ()
Pull up following revision(s) (requested by riastradh in ticket #1320):

	sys/external/bsd/drm2/linux/linux_reservation.c: revision 1.12

drm: Release fence after use.

May plug the dreaded radeon kmem memory leak.
XXX pullup-9


(martin)
diff -r1.11 -r1.11.8.1 src/sys/external/bsd/drm2/linux/linux_reservation.c
cvs diff -r1.11 -r1.11.8.1 src/sys/external/bsd/drm2/linux/Attic/linux_reservation.c (expand / switch to unified diff)

--- src/sys/external/bsd/drm2/linux/Attic/linux_reservation.c 2018/09/03 18:02:11 1.11
+++ src/sys/external/bsd/drm2/linux/Attic/linux_reservation.c 2021/07/08 11:23:28 1.11.8.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: linux_reservation.c,v 1.11 2018/09/03 18:02:11 riastradh Exp $ */ 1/* $NetBSD: linux_reservation.c,v 1.11.8.1 2021/07/08 11:23:28 martin Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2018 The NetBSD Foundation, Inc. 4 * Copyright (c) 2018 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Taylor R. Campbell. 8 * by Taylor R. Campbell.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -20,27 +20,27 @@ @@ -20,27 +20,27 @@
20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29 * POSSIBILITY OF SUCH DAMAGE. 29 * POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32#include <sys/cdefs.h> 32#include <sys/cdefs.h>
33__KERNEL_RCSID(0, "$NetBSD: linux_reservation.c,v 1.11 2018/09/03 18:02:11 riastradh Exp $"); 33__KERNEL_RCSID(0, "$NetBSD: linux_reservation.c,v 1.11.8.1 2021/07/08 11:23:28 martin Exp $");
34 34
35#include <sys/param.h> 35#include <sys/param.h>
36#include <sys/poll.h> 36#include <sys/poll.h>
37#include <sys/select.h> 37#include <sys/select.h>
38 38
39#include <linux/fence.h> 39#include <linux/fence.h>
40#include <linux/reservation.h> 40#include <linux/reservation.h>
41#include <linux/ww_mutex.h> 41#include <linux/ww_mutex.h>
42 42
43DEFINE_WW_CLASS(reservation_ww_class __cacheline_aligned); 43DEFINE_WW_CLASS(reservation_ww_class __cacheline_aligned);
44 44
45static struct reservation_object_list * 45static struct reservation_object_list *
46objlist_tryalloc(uint32_t n) 46objlist_tryalloc(uint32_t n)
@@ -786,26 +786,27 @@ restart: @@ -786,26 +786,27 @@ restart:
786 rcu_read_unlock(); 786 rcu_read_unlock();
787 goto top; 787 goto top;
788 788
789wait: 789wait:
790 /* 790 /*
791 * Exit the RCU read section and wait for it. If we time out 791 * Exit the RCU read section and wait for it. If we time out
792 * or fail, bail. Otherwise, go back to the top. 792 * or fail, bail. Otherwise, go back to the top.
793 */ 793 */
794 KASSERT(fence != NULL); 794 KASSERT(fence != NULL);
795 rcu_read_unlock(); 795 rcu_read_unlock();
796 ret = fence_wait_timeout(fence, intr, timeout); 796 ret = fence_wait_timeout(fence, intr, timeout);
797 if (ret <= 0) 797 if (ret <= 0)
798 return ret; 798 return ret;
 799 fence_put(fence);
799 KASSERT(ret <= timeout); 800 KASSERT(ret <= timeout);
800 timeout = ret; 801 timeout = ret;
801 goto top; 802 goto top;
802} 803}
803 804
804/* 805/*
805 * reservation_poll_init(rpoll, lock) 806 * reservation_poll_init(rpoll, lock)
806 * 807 *
807 * Initialize reservation poll state. 808 * Initialize reservation poll state.
808 */ 809 */
809void 810void
810reservation_poll_init(struct reservation_poll *rpoll) 811reservation_poll_init(struct reservation_poll *rpoll)
811{ 812{