Attachment 13195 Details for Bug 12766 – Patch for 4.5 and 4.6 cherry-picked from master

[patch] Patch for 4.5 and 4.6 cherry-picked from master

bug12766-v45,v46.patch (text/plain), 6.40 KB, created by Ralph Böhme on 2017-05-07 06:43:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralph Böhme

Created: 2017-05-07 06:43:02 UTC

Size: 6.40 KB

patch

obsolete

>From 73b8d8719f754ad4a7f6dc3bf553c12ad0bbaee1 Mon Sep 17 00:00:00 2001
>From: Ralph Boehme <slow@samba.org>
>Date: Thu, 4 May 2017 11:50:01 +0200
>Subject: [PATCH 1/4] s3/locking: add const to fsp_lease_type
>
>Bug: https://bugzilla.samba.org/show_bug.cgi?id=12766
>
>Signed-off-by: Ralph Boehme <slow@samba.org>
>Reviewed-by: Jeremy Allison <jra@samba.org>
>(cherry picked from commit 952701dce09b1ee89a0f6a450ac244fd6451955b)
>---
> source3/locking/leases_util.c | 2 +-
> source3/locking/proto.h       | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/source3/locking/leases_util.c b/source3/locking/leases_util.c
>index cb307c8..5d07ff9 100644
>--- a/source3/locking/leases_util.c
>+++ b/source3/locking/leases_util.c
>@@ -46,7 +46,7 @@ uint32_t map_oplock_to_lease_type(uint16_t op_type)
> 	return ret;
> }
> 
>-uint32_t fsp_lease_type(struct files_struct *fsp)
>+uint32_t fsp_lease_type(const struct files_struct *fsp)
> {
> 	if (fsp->oplock_type == LEASE_OPLOCK) {
> 		return fsp->lease->lease.lease_state;
>diff --git a/source3/locking/proto.h b/source3/locking/proto.h
>index 17cb1cd..31c4968 100644
>--- a/source3/locking/proto.h
>+++ b/source3/locking/proto.h
>@@ -250,6 +250,6 @@ bool release_posix_lock_posix_flavour(files_struct *fsp,
> 
> /* The following definitions come from locking/leases_util.c */
> uint32_t map_oplock_to_lease_type(uint16_t op_type);
>-uint32_t fsp_lease_type(struct files_struct *fsp);
>+uint32_t fsp_lease_type(const struct files_struct *fsp);
> 
> #endif /* _LOCKING_PROTO_H_ */
>-- 
>2.9.3
>
>
>From 90cbcf02ab9ed28a90810792249d251b86f99128 Mon Sep 17 00:00:00 2001
>From: Ralph Boehme <slow@samba.org>
>Date: Thu, 4 May 2017 11:50:56 +0200
>Subject: [PATCH 2/4] s3/locking: helper functions for lease types
>
>Add some helper functions that will be used to update a bunch of checks
>for exclusive oplocks to the lease area.
>
>Bug: https://bugzilla.samba.org/show_bug.cgi?id=12766
>
>Signed-off-by: Ralph Boehme <slow@samba.org>
>Reviewed-by: Jeremy Allison <jra@samba.org>
>(cherry picked from commit f631e95e2de857ea98204609a71e6db00993994b)
>---
> source3/locking/leases_util.c | 17 +++++++++++++++++
> source3/locking/proto.h       |  2 ++
> 2 files changed, 19 insertions(+)
>
>diff --git a/source3/locking/leases_util.c b/source3/locking/leases_util.c
>index 5d07ff9..af1e837 100644
>--- a/source3/locking/leases_util.c
>+++ b/source3/locking/leases_util.c
>@@ -53,3 +53,20 @@ uint32_t fsp_lease_type(const struct files_struct *fsp)
> 	}
> 	return map_oplock_to_lease_type(fsp->oplock_type);
> }
>+
>+uint32_t lease_type_is_exclusive(uint32_t lease_type)
>+{
>+	if ((lease_type & (SMB2_LEASE_READ | SMB2_LEASE_WRITE)) ==
>+	    (SMB2_LEASE_READ | SMB2_LEASE_WRITE)) {
>+		return true;
>+	}
>+
>+	return false;
>+}
>+
>+bool fsp_lease_type_is_exclusive(const struct files_struct *fsp)
>+{
>+	uint32_t lease_type = fsp_lease_type(fsp);
>+
>+	return lease_type_is_exclusive(lease_type);
>+}
>diff --git a/source3/locking/proto.h b/source3/locking/proto.h
>index 31c4968..461f89a 100644
>--- a/source3/locking/proto.h
>+++ b/source3/locking/proto.h
>@@ -251,5 +251,7 @@ bool release_posix_lock_posix_flavour(files_struct *fsp,
> /* The following definitions come from locking/leases_util.c */
> uint32_t map_oplock_to_lease_type(uint16_t op_type);
> uint32_t fsp_lease_type(const struct files_struct *fsp);
>+uint32_t lease_type_is_exclusive(uint32_t lease_type);
>+bool fsp_lease_type_is_exclusive(const struct files_struct *fsp);
> 
> #endif /* _LOCKING_PROTO_H_ */
>-- 
>2.9.3
>
>
>From c0f4bb9cb89915a42f25ddbdf0d7391aad86b877 Mon Sep 17 00:00:00 2001
>From: Ralph Boehme <slow@samba.org>
>Date: Thu, 20 Apr 2017 21:37:37 +0200
>Subject: [PATCH 3/4] s3/smbd: update exclusive oplock optimisation to the
> lease area
>
>This is similar to 9533a55ee5ffe430589dcea845851b84876ef656 but this
>time in the contend_level2_oplocks_begin_default() function.
>
>The idea of the optimisation is to avoid expensive db queries in
>locking.tdb if we *know* we're the only open.
>
>Bug: https://bugzilla.samba.org/show_bug.cgi?id=12766
>
>Signed-off-by: Ralph Boehme <slow@samba.org>
>Reviewed-by: Jeremy Allison <jra@samba.org>
>(cherry picked from commit 0a4a08ad1cef3b7d6fd47df3a93c2c89dd287ee8)
>---
> source3/smbd/oplock.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
>index 57b53f8..fb5abfe 100644
>--- a/source3/smbd/oplock.c
>+++ b/source3/smbd/oplock.c
>@@ -1043,7 +1043,7 @@ static void contend_level2_oplocks_begin_default(files_struct *fsp,
> 	 * the shared memory area whilst doing this.
> 	 */
> 
>-	if (EXCLUSIVE_OPLOCK_TYPE(fsp->oplock_type)) {
>+	if (fsp_lease_type_is_exclusive(fsp)) {
> 		/*
> 		 * There can't be any level2 oplocks, we're alone.
> 		 */
>-- 
>2.9.3
>
>
>From 0786d6016b002ba34c6cfd8fa8634eff8a9f15e3 Mon Sep 17 00:00:00 2001
>From: Ralph Boehme <slow@samba.org>
>Date: Thu, 4 May 2017 11:52:16 +0200
>Subject: [PATCH 4/4] s3/smbd: update exclusive oplock optimisation to the
> lease area
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Update an optimisation in update_num_read_oplocks() that checks for
>exclusive oplocks to the lease area.
>
>The idea of the optimisation is to avoid expensive db queries in
>brlock.tdb if we *know* we're the only open.
>
>Bug: https://bugzilla.samba.org/show_bug.cgi?id=12766
>
>Signed-off-by: Ralph Boehme <slow@samba.org>
>Signed-off-by: Jeremy Allison <jra@samba.org>
>
>Autobuild-User(master): Ralph BÃ¶hme <slow@samba.org>
>Autobuild-Date(master): Sat May  6 22:58:47 CEST 2017 on sn-devel-144
>
>(cherry picked from commit a50343779a8a92d6f53095b36506b1d47ef68513)
>---
> source3/smbd/oplock.c | 13 +++++++++----
> 1 file changed, 9 insertions(+), 4 deletions(-)
>
>diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
>index fb5abfe..ff7c037 100644
>--- a/source3/smbd/oplock.c
>+++ b/source3/smbd/oplock.c
>@@ -165,13 +165,18 @@ bool update_num_read_oplocks(files_struct *fsp, struct share_mode_lock *lck)
> 	uint32_t num_read_oplocks = 0;
> 	uint32_t i;
> 
>-	if (EXCLUSIVE_OPLOCK_TYPE(fsp->oplock_type)) {
>+	if (fsp_lease_type_is_exclusive(fsp)) {
> 		/*
>-		 * If we're the only one, we don't need a brlock entry
>+		 * If we're fully exclusive, we don't need a brlock entry
> 		 */
> 		remove_stale_share_mode_entries(d);
>-		SMB_ASSERT(d->num_share_modes == 1);
>-		SMB_ASSERT(EXCLUSIVE_OPLOCK_TYPE(d->share_modes[0].op_type));
>+
>+		for (i=0; i<d->num_share_modes; i++) {
>+			struct share_mode_entry *e = &d->share_modes[i];
>+			uint32_t e_lease_type = get_lease_type(d, e);
>+
>+			SMB_ASSERT(lease_type_is_exclusive(e_lease_type));
>+		}
> 		return true;
> 	}
> 
>-- 
>2.9.3
>

Flags:

jra: review+

Actions: View

Attachments on bug 12766: 13195