Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1277409 > unrolled thread

[PATCH] target: use offset_in_page macro

Started byGeliang Tang <geliangtang@163.com>
First post2015-11-25 15:00 +0100
Last post2015-11-30 01:30 +0100
Articles 3 — 3 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH] target: use offset_in_page macro Geliang Tang <geliangtang@163.com> - 2015-11-25 15:00 +0100
    Re: [PATCH] target: use offset_in_page macro Johannes Thumshirn <jthumshirn@suse.de> - 2015-11-25 15:10 +0100
    Re: [PATCH] target: use offset_in_page macro "Nicholas A. Bellinger" <nab@linux-iscsi.org> - 2015-11-30 01:30 +0100

#1277409 — [PATCH] target: use offset_in_page macro

FromGeliang Tang <geliangtang@163.com>
Date2015-11-25 15:00 +0100
Subject[PATCH] target: use offset_in_page macro
Message-ID<qyIM2-71G-5@gated-at.bofh.it>
Use offset_in_page macro instead of (addr & ~PAGE_MASK).

Signed-off-by: Geliang Tang <geliangtang@163.com>
---
 drivers/target/target_core_user.c | 2 +-
 drivers/target/tcm_fc/tfc_io.c    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/target/target_core_user.c b/drivers/target/target_core_user.c
index 937cebf..d5477c0 100644
--- a/drivers/target/target_core_user.c
+++ b/drivers/target/target_core_user.c
@@ -194,7 +194,7 @@ static struct tcmu_cmd *tcmu_alloc_cmd(struct se_cmd *se_cmd)
 
 static inline void tcmu_flush_dcache_range(void *vaddr, size_t size)
 {
-	unsigned long offset = (unsigned long) vaddr & ~PAGE_MASK;
+	unsigned long offset = offset_in_page(vaddr);
 
 	size = round_up(size+offset, PAGE_SIZE);
 	vaddr -= offset;
diff --git a/drivers/target/tcm_fc/tfc_io.c b/drivers/target/tcm_fc/tfc_io.c
index 847c1aa..6f7c65a 100644
--- a/drivers/target/tcm_fc/tfc_io.c
+++ b/drivers/target/tcm_fc/tfc_io.c
@@ -154,9 +154,9 @@ int ft_queue_data_in(struct se_cmd *se_cmd)
 			BUG_ON(!page);
 			from = kmap_atomic(page + (mem_off >> PAGE_SHIFT));
 			page_addr = from;
-			from += mem_off & ~PAGE_MASK;
+			from += offset_in_page(mem_off);
 			tlen = min(tlen, (size_t)(PAGE_SIZE -
-						(mem_off & ~PAGE_MASK)));
+						offset_in_page(mem_off)));
 			memcpy(to, from, tlen);
 			kunmap_atomic(page_addr);
 			to += tlen;
@@ -314,9 +314,9 @@ void ft_recv_write_data(struct ft_cmd *cmd, struct fc_frame *fp)
 
 		to = kmap_atomic(page + (mem_off >> PAGE_SHIFT));
 		page_addr = to;
-		to += mem_off & ~PAGE_MASK;
+		to += offset_in_page(mem_off);
 		tlen = min(tlen, (size_t)(PAGE_SIZE -
-					  (mem_off & ~PAGE_MASK)));
+					  offset_in_page(mem_off)));
 		memcpy(to, from, tlen);
 		kunmap_atomic(page_addr);
 
-- 
2.5.0


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [next] | [standalone]

#1277411

FromJohannes Thumshirn <jthumshirn@suse.de>
Date2015-11-25 15:10 +0100
Message-ID<qyIVH-7kz-3@gated-at.bofh.it>
In reply to#1277409
On Wed, 2015-11-25 at 21:49 +0800, Geliang Tang wrote:
> Use offset_in_page macro instead of (addr & ~PAGE_MASK).
> 
> Signed-off-by: Geliang Tang <geliangtang@163.com>
> ---
>  drivers/target/target_core_user.c | 2 +-
>  drivers/target/tcm_fc/tfc_io.c    | 8 ++++----
>  2 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/target/target_core_user.c
> b/drivers/target/target_core_user.c
> index 937cebf..d5477c0 100644
> --- a/drivers/target/target_core_user.c
> +++ b/drivers/target/target_core_user.c
> @@ -194,7 +194,7 @@ static struct tcmu_cmd *tcmu_alloc_cmd(struct se_cmd
> *se_cmd)
>  
>  static inline void tcmu_flush_dcache_range(void *vaddr, size_t size)
>  {
> -	unsigned long offset = (unsigned long) vaddr & ~PAGE_MASK;
> +	unsigned long offset = offset_in_page(vaddr);
>  
>  	size = round_up(size+offset, PAGE_SIZE);
>  	vaddr -= offset;
> diff --git a/drivers/target/tcm_fc/tfc_io.c b/drivers/target/tcm_fc/tfc_io.c
> index 847c1aa..6f7c65a 100644
> --- a/drivers/target/tcm_fc/tfc_io.c
> +++ b/drivers/target/tcm_fc/tfc_io.c
> @@ -154,9 +154,9 @@ int ft_queue_data_in(struct se_cmd *se_cmd)
>  			BUG_ON(!page);
>  			from = kmap_atomic(page + (mem_off >> PAGE_SHIFT));
>  			page_addr = from;
> -			from += mem_off & ~PAGE_MASK;
> +			from += offset_in_page(mem_off);
>  			tlen = min(tlen, (size_t)(PAGE_SIZE -
> -						(mem_off & ~PAGE_MASK)));
> +						offset_in_page(mem_off)));
>  			memcpy(to, from, tlen);
>  			kunmap_atomic(page_addr);
>  			to += tlen;
> @@ -314,9 +314,9 @@ void ft_recv_write_data(struct ft_cmd *cmd, struct
> fc_frame *fp)
>  
>  		to = kmap_atomic(page + (mem_off >> PAGE_SHIFT));
>  		page_addr = to;
> -		to += mem_off & ~PAGE_MASK;
> +		to += offset_in_page(mem_off);
>  		tlen = min(tlen, (size_t)(PAGE_SIZE -
> -					  (mem_off & ~PAGE_MASK)));
> +					  offset_in_page(mem_off)));
>  		memcpy(to, from, tlen);
>  		kunmap_atomic(page_addr);
>  

Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1279481

From"Nicholas A. Bellinger" <nab@linux-iscsi.org>
Date2015-11-30 01:30 +0100
Message-ID<qAkvU-4D0-1@gated-at.bofh.it>
In reply to#1277409
Hi Geliang,

On Wed, 2015-11-25 at 21:49 +0800, Geliang Tang wrote:
> Use offset_in_page macro instead of (addr & ~PAGE_MASK).
> 
> Signed-off-by: Geliang Tang <geliangtang@163.com>
> ---
>  drivers/target/target_core_user.c | 2 +-
>  drivers/target/tcm_fc/tfc_io.c    | 8 ++++----
>  2 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/target/target_core_user.c b/drivers/target/target_core_user.c
> index 937cebf..d5477c0 100644
> --- a/drivers/target/target_core_user.c
> +++ b/drivers/target/target_core_user.c
> @@ -194,7 +194,7 @@ static struct tcmu_cmd *tcmu_alloc_cmd(struct se_cmd *se_cmd)
>  
>  static inline void tcmu_flush_dcache_range(void *vaddr, size_t size)
>  {
> -	unsigned long offset = (unsigned long) vaddr & ~PAGE_MASK;
> +	unsigned long offset = offset_in_page(vaddr);
>  
>  	size = round_up(size+offset, PAGE_SIZE);
>  	vaddr -= offset;
> diff --git a/drivers/target/tcm_fc/tfc_io.c b/drivers/target/tcm_fc/tfc_io.c
> index 847c1aa..6f7c65a 100644
> --- a/drivers/target/tcm_fc/tfc_io.c
> +++ b/drivers/target/tcm_fc/tfc_io.c
> @@ -154,9 +154,9 @@ int ft_queue_data_in(struct se_cmd *se_cmd)
>  			BUG_ON(!page);
>  			from = kmap_atomic(page + (mem_off >> PAGE_SHIFT));
>  			page_addr = from;
> -			from += mem_off & ~PAGE_MASK;
> +			from += offset_in_page(mem_off);
>  			tlen = min(tlen, (size_t)(PAGE_SIZE -
> -						(mem_off & ~PAGE_MASK)));
> +						offset_in_page(mem_off)));
>  			memcpy(to, from, tlen);
>  			kunmap_atomic(page_addr);
>  			to += tlen;
> @@ -314,9 +314,9 @@ void ft_recv_write_data(struct ft_cmd *cmd, struct fc_frame *fp)
>  
>  		to = kmap_atomic(page + (mem_off >> PAGE_SHIFT));
>  		page_addr = to;
> -		to += mem_off & ~PAGE_MASK;
> +		to += offset_in_page(mem_off);
>  		tlen = min(tlen, (size_t)(PAGE_SIZE -
> -					  (mem_off & ~PAGE_MASK)));
> +					  offset_in_page(mem_off)));
>  		memcpy(to, from, tlen);
>  		kunmap_atomic(page_addr);
>  

Applied to target-pending/for-next.

Thank you,

--nab

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web